[evolvis-commits] r13923: Merged a few fixes from 4.8

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 03:37:16 CET 2011


Author: mirabilos
Date: 2011-02-28 03:37:15 +0100 (Mon, 28 Feb 2011)
New Revision: 13923

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules
   trunk/gforge_base/evolvisforge-5.1/gforge/gforge-install-3-db.php
   trunk/gforge_base/evolvisforge-5.1/gforge/install.sh
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmsvn/common/SVNPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/help/tracker.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/pm/reporting/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/project/stats/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/groupadded.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/groupadded_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/groupcum.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/groupcum_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projectact.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projectact_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projecttime.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/projecttime_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/siteact_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetime.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetime_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetimebar.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/sitetimebar_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/timeadd.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/toolspie.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/toolspie_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/trackerpie_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/useract.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/useract_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/useradded.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/useradded_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usercum.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usercum_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usersummary.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/reporting/usertime_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/browse.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/reporting/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/reporting/trackeract_graph.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/tracker/reporting/trackerpie_graph.php
Log:
Merged a few fixes from 4.8

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php	2011-02-28 02:37:11 UTC (rev 13922)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php	2011-02-28 02:37:15 UTC (rev 13923)
@@ -248,12 +248,12 @@
 	*/
 	function hasDocuments(&$nested_groups, &$document_factory, $stateid=0) {
 		global $doc_group_id;
+		$doc_group_id = $this->getID();
 		static $result = array();	// this function will probably be called several times so we better store results in order to speed things up
-		if (!is_array(@$result[$stateid])) $result[$stateid] = array();
+		if (!array_key_exists($stateid, $result) || !is_array($result[$stateid])) $result[$stateid] = array();
+
 		if (array_key_exists($doc_group_id, $result[$stateid])) return $result[$stateid][$doc_group_id];
 
-		$doc_group_id = $this->getID();
-		
 		// check if it has documents
 		if ($stateid) {
 			$document_factory->setStateID($stateid);
@@ -266,10 +266,10 @@
 		}
 		
 		// this group doesn't have documents... check recursively on the childs
-		if (is_array($nested_groups["$doc_group_id"])) {
-			$count = count($nested_groups["$doc_group_id"]);
+		if (array_key_exists($doc_group_id,$nested_groups) && is_array($nested_groups[$doc_group_id])) {
+			$count = count($nested_groups[$doc_group_id]);
 			for ($i=0; $i < $count; $i++) {
-				if ($nested_groups["$doc_group_id"][$i]->hasDocuments($nested_groups, $document_factory, $stateid)) {
+				if ($nested_groups[$doc_group_id][$i]->hasDocuments($nested_groups, $document_factory, $stateid)) {
 					// child has documents
 					$result[$stateid][$doc_group_id] = true;
 					return true;
@@ -293,15 +293,15 @@
 	function hasSubgroup(&$nested_groups, $doc_subgroup_id) {
 		$doc_group_id = $this->getID();
 
-		if (is_array(@$nested_groups["$doc_group_id"])) {
-			$count = count($nested_groups["$doc_group_id"]);
+		if (is_array(@$nested_groups[$doc_group_id])) {
+			$count = count($nested_groups[$doc_group_id]);
 			for ($i=0; $i < $count; $i++) {
 				// child is a match?
-				if ($nested_groups["$doc_group_id"][$i]->getID() == $doc_subgroup_id) {
+				if ($nested_groups[$doc_group_id][$i]->getID() == $doc_subgroup_id) {
 					return true;
 				} else {
 					// recursively check if this child has this subgroup
-					if ($nested_groups["$doc_group_id"][$i]->hasSubgroup($nested_groups, $doc_subgroup_id)) {
+					if ($nested_groups[$doc_group_id][$i]->hasSubgroup($nested_groups, $doc_subgroup_id)) {
 						return true;
 					}
 				}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 02:37:11 UTC (rev 13922)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 02:37:15 UTC (rev 13923)
@@ -36,6 +36,15 @@
 
  -- Roland Mas <lolando at debian.org>  Wed, 29 Apr 2009 15:21:31 +0200
 
+gforge (4.8.1-2) unstable; urgency=low
+
+  * New upstream snapshot from the 4.8 branch.
+  * Fixed file conflict between -web-apache2 and -plugin-mediawiki.
+  * Bumped Standards-Version to 3.8.3 (no changes).
+  * Bumped versioned dependency on debhelper to >= 5.
+
+ -- Roland Mas <lolando at debian.org>  Wed, 14 Oct 2009 14:50:26 +0200
+
 gforge (4.8.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-28 02:37:11 UTC (rev 13922)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-28 02:37:15 UTC (rev 13923)
@@ -4,8 +4,8 @@
 Maintainer: Roland Mas <lolando at debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>
 Build-Depends-Indep: sharutils, docbook-to-man, devscripts
-Build-Depends: debhelper (>= 4.1.16), dpatch, perl, gettext
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5), dpatch, perl, gettext
+Standards-Version: 3.8.3
 Homepage: http://fusionforge.org/
 Vcs-Bzr: http://scm.fusionforge.org/bzr/fusionforge/svn-trunk-ro
 



More information about the evolvis-commits mailing list