[evolvis-commits] r6868: merge bm:taramir/upstream

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Aug 12 09:13:55 CEST 2010


Author: mirabilos
Date: 2010-08-12 09:13:55 +0200 (Thu, 12 Aug 2010)
New Revision: 6868

Modified:
   trunk/gforge_base/evolvisforge/gforge/common/docman/Document.class.php
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/www/account/lostlogin.php
Log:
merge bm:taramir/upstream

Modified: trunk/gforge_base/evolvisforge/gforge/common/docman/Document.class.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/docman/Document.class.php	2010-08-10 08:10:17 UTC (rev 6867)
+++ trunk/gforge_base/evolvisforge/gforge/common/docman/Document.class.php	2010-08-12 07:13:55 UTC (rev 6868)
@@ -253,7 +253,7 @@
 	 */
 	function isText() {
 		$doctype = $this->data_array['filetype'];
-		if (preg_match('/text/i',$doctype)) { // text plain, text html, text x-patch, etc
+		if (preg_match('|^text/|i',$doctype)) { // text plain, text html, text x-patch, etc
 			return true;
 		}	
 		return false;

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-08-10 08:10:17 UTC (rev 6867)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-08-12 07:13:55 UTC (rev 6868)
@@ -8,8 +8,9 @@
   * Use the same RNG throughout the code (being /dev/urandom for us)
   * Configuration items sys_activity_{base,user,pass} for interfacing
     the in-house timetracking system
+  * Merge bugfixes from FusionForge 4.8-stable branch
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 10 Aug 2010 10:07:51 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 Aug 2010 09:11:41 +0200
 
 gforge (4.8.3+evolvis23) unstable; urgency=low
 



More information about the evolvis-commits mailing list