[Fusionforge-commits] r8755 - trunk/gforge/common/docman

[Franck VILLAUME]

Author: nerville
Date: 2010-02-09 13:02:43 +0100 (Tue, 09 Feb 2010)
New Revision: 8755

Modified:
   trunk/gforge/common/docman/
   trunk/gforge/common/docman/DocumentGroup.class.php
Log:
merge from Branch_4_8


Property changes on: trunk/gforge/common/docman
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/Branch_4_7/gforge/common/docman:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_4_8/gforge/common/docman:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8704-8754
/trunk/gforge/common/docman:8721-8727

Modified: trunk/gforge/common/docman/DocumentGroup.class.php
===================================================================
--- trunk/gforge/common/docman/DocumentGroup.class.php	2010-02-09 10:40:50 UTC (rev 8754)
+++ trunk/gforge/common/docman/DocumentGroup.class.php	2010-02-09 12:02:43 UTC (rev 8755)
@@ -304,7 +304,6 @@
 	* @param int	(optional) State of the documents
 	*/
 	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 (!array_key_exists($stateid, $result) || !is_array($result[$stateid])) $result[$stateid] = array();