[Fusionforge-commits] r6949 - in trunk: . gforge/common/include gforge/cronjobs gforge/debian gforge/www/frs/admin gforge/www/include

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Feb 5 22:15:33 CET 2009


Author: lolando
Date: 2009-02-05 22:15:33 +0100 (Thu, 05 Feb 2009)
New Revision: 6949

Modified:
   trunk/
   trunk/gforge/common/include/FusionForge.class.php
   trunk/gforge/common/include/utils.php
   trunk/gforge/cronjobs/massmail.php
   trunk/gforge/debian/changelog
   trunk/gforge/www/frs/admin/editrelease.php
   trunk/gforge/www/include/squal_pre.php
Log:
Merged from 4.7: 4.7.1 release, a few PHP notices and a fixed include path


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948


Modified: trunk/gforge/common/include/FusionForge.class.php
===================================================================
--- trunk/gforge/common/include/FusionForge.class.php	2009-02-05 21:04:10 UTC (rev 6948)
+++ trunk/gforge/common/include/FusionForge.class.php	2009-02-05 21:15:33 UTC (rev 6949)
@@ -35,7 +35,7 @@
 		$this->Error();
 
 		$this->software_name = 'FusionForge' ;
-		$this->software_version = '4.7' ;
+		$this->software_version = '4.7.1' ;
 
 		return true;
 	}

Modified: trunk/gforge/common/include/utils.php
===================================================================
--- trunk/gforge/common/include/utils.php	2009-02-05 21:04:10 UTC (rev 6948)
+++ trunk/gforge/common/include/utils.php	2009-02-05 21:15:33 UTC (rev 6949)
@@ -274,18 +274,18 @@
 				$address['email'][]=db_result($res,$i,'email');
 			}
 		}
-		if (count($address['email']) > 0) {
-			$extra_email1=implode($address['email'],',').',';
+		if (isset ($address['email']) && count($address['email']) > 0) {
+			$extra_emails=implode($address['email'],',').',' . $extra_emails;
 		}
-		if (count($address['jabber_address']) > 0) {
-			$extra_jabber1=implode($address['jabber_address'],',').',';
+		if (isset ($address['jabber_address']) && count($address['jabber_address']) > 0) {
+			$extra_jabbers=implode($address['jabber_address'],',').','.$extra_jabbers;
 		}
 	}
-	if ($extra_email1 || $extra_emails) {
-		util_send_message('',$subject,$body,$from,$extra_email1.$extra_emails);
+	if ($extra_emails) {
+		util_send_message('',$subject,$body,$from,$extra_emails);
 	}
-	if ($extra_jabber1 || $extra_jabbers) {
-		util_send_jabber($extra_jabber1.$extra_jabbers,$subject,$body);
+	if ($extra_jabbers) {
+		util_send_jabber($extra_jabbers,$subject,$body);
 	}
 }
 

Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2009-02-05 21:04:10 UTC (rev 6948)
+++ trunk/gforge/debian/changelog	2009-02-05 21:15:33 UTC (rev 6949)
@@ -1,9 +1,15 @@
-gforge (4.7+scmbzr-1) experimental; urgency=low
+gforge (4.7.1+svn-0) experimental; urgency=low
 
   * New package: gforge-plugin-scmbzr (not complete yet!).
 
- -- Roland Mas <lolando at debian.org>  Wed, 04 Feb 2009 17:53:58 +0100
+ -- Roland Mas <lolando at debian.org>  Thu, 05 Feb 2009 22:14:45 +0100
 
+gforge (4.7.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Roland Mas <lolando at debian.org>  Thu, 05 Feb 2009 21:01:10 +0100
+
 gforge (4.7-1) experimental; urgency=low
 
   [ Roland Mas ]

Modified: trunk/gforge/www/frs/admin/editrelease.php
===================================================================
--- trunk/gforge/www/frs/admin/editrelease.php	2009-02-05 21:04:10 UTC (rev 6948)
+++ trunk/gforge/www/frs/admin/editrelease.php	2009-02-05 21:15:33 UTC (rev 6949)
@@ -143,6 +143,8 @@
 	$userfile = getUploadedFile('userfile');
 	$userfile_name = $userfile['name'];
 	$type_id = getIntFromRequest('type_id');
+	$release_date = getStringFromRequest('release_date');
+	$release_date = strtotime($release_date);
 	$processor_id = getStringFromRequest('processor_id');
 	// Build a Unix time value from the supplied Y-m-d value
 	$group_unix_name=group_getunixname($group_id);

Modified: trunk/gforge/www/include/squal_pre.php
===================================================================
--- trunk/gforge/www/include/squal_pre.php	2009-02-05 21:04:10 UTC (rev 6948)
+++ trunk/gforge/www/include/squal_pre.php	2009-02-05 21:15:33 UTC (rev 6949)
@@ -20,7 +20,7 @@
     ob_start("ob_gzhandler");
 }
 
-require_once 'env.inc.php' ;
+require_once ('../env.inc.php') ;
 require $gfcgfile;
 require $gfcommon.'include/constants.php';
 require_once $gfcommon.'include/database-'.$sys_database_type.'.php';




More information about the Fusionforge-commits mailing list