[evolvis-commits] r6546: merge bm:taramir/ upstream↵

Thorsten Glaser t.glaser at tarent.de
Tue Apr 20 16:15:59 CEST 2010


Author: Thorsten Glaser <t.glaser at tarent.de>
Date: 2010-04-20 16:15:59 +0200 (Tue, 20 Apr 2010)
New Revision: 6546

Modified:
   trunk/gforge_base/evolvisforge/gforge/common/include/User.class.php
   trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
Log:
merge bm:taramir/upstream


Modified: trunk/gforge_base/evolvisforge/gforge/common/include/User.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/User.class.php	2010-04-20 14:15:55 UTC (rev 6545)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/User.class.php	2010-04-20 14:15:59 UTC (rev 6546)
@@ -354,6 +354,8 @@
 
 <%2$s>
 
+You have 1 week to confirm your account. After this time, your account will be deleted.
+
 (If you don\'t see any URL above, it is likely due to a bug in your mail client.
 Use one below, but make sure it is entered as the single line.)
 

Modified: trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php	2010-04-20 14:15:55 UTC (rev 6545)
+++ trunk/gforge_base/evolvisforge/gforge/common/tracker/ArtifactType.class.php	2010-04-20 14:15:59 UTC (rev 6546)
@@ -513,7 +513,7 @@
 				$status_id=db_result($res,0,'status_id');
 			} else {
 				// custom status was not passed... use the first status from the database
-				$res = db_query_prams ('SELECT status_id FROM artifact_extra_field_elements WHERE extra_field_id=$1 ORDER BY element_id ASC LIMIT 1 OFFSET 0',
+				$res = db_query_params ('SELECT status_id FROM artifact_extra_field_elements WHERE extra_field_id=$1 ORDER BY element_id ASC LIMIT 1 OFFSET 0',
 						       array ($csfield)) ;
 				if (db_numrows($res) == 0) {		// No values available
 					$this->setError('Error Remapping Status');

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-04-20 14:15:55 UTC (rev 6545)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-04-20 14:15:59 UTC (rev 6546)
@@ -3,8 +3,9 @@
   * gf-p-mediawiki: default to enabling file uploads; [TTID# 1003495]
   * Add $sys_hudson_base (default: empty)
   * gf-p-mw: put group name into <title> header
+  * merge bugfixes from upstream 4.8-stable branch
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 19 Apr 2010 16:41:21 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 20 Apr 2010 12:19:08 +0200
 
 gforge (4.8.3+evolvis4) unstable; urgency=low
 




More information about the evolvis-commits mailing list