[Fusionforge-commits] r11500 - in trunk/src/plugins/wiki/www: . lib

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Wed Nov 10 21:11:45 CET 2010


Author: vargenau
Date: 2010-11-10 21:11:45 +0100 (Wed, 10 Nov 2010)
New Revision: 11500

Modified:
   trunk/src/plugins/wiki/www/INSTALL
   trunk/src/plugins/wiki/www/lib/loadsave.php
   trunk/src/plugins/wiki/www/lib/main.php
Log:
Update from Phpwiki

Modified: trunk/src/plugins/wiki/www/INSTALL
===================================================================
--- trunk/src/plugins/wiki/www/INSTALL	2010-11-10 19:41:45 UTC (rev 11499)
+++ trunk/src/plugins/wiki/www/INSTALL	2010-11-10 20:11:45 UTC (rev 11500)
@@ -1,7 +1,8 @@
 REQUIREMENTS
 
-PhpWiki requires a web server with at least PHP version 4.3.10.
-PhpWiki was tested with 4.4.7 (centos4), 4.3.10, 4.4.9, 5.0.3,
+PhpWiki requires a web server with at least PHP version 4.3.9 
+(Red Hat Enterprise Linux ES release 4).
+PhpWiki was tested with 4.4.7 (centos4), 4.3.9, 4.3.10, 4.4.9, 5.0.3,
 5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
 
 All users of PHP are strongly encouraged to upgrade to PHP 5.2.14
@@ -151,4 +152,4 @@
 
 FIN
 
-$Id: INSTALL 7730 2010-11-08 14:48:23Z vargenau $
+$Id: INSTALL 7737 2010-11-10 08:47:34Z rurban $

Modified: trunk/src/plugins/wiki/www/lib/loadsave.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/loadsave.php	2010-11-10 19:41:45 UTC (rev 11499)
+++ trunk/src/plugins/wiki/www/lib/loadsave.php	2010-11-10 20:11:45 UTC (rev 11500)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: loadsave.php 7664 2010-08-31 15:42:34Z vargenau $');
+// rcs_id('$Id: loadsave.php 7739 2010-11-10 16:51:32Z vargenau $');
 
 /*
  * Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
@@ -117,6 +117,7 @@
         echo "</div>\n";
         echo "</td></tr>\n";
         echo "</table>\n";
+        echo "</div>\n";
         echo "</td></tr>\n";
         echo "</table>\n";
     } else if (isa($WikiTheme, 'WikiTheme_Sidebar')
@@ -1475,11 +1476,8 @@
     $source = $request->getArg('source');
     $finder = new FileFinder;
     $source = $finder->slashifyPath($source);
-    $page = rawurldecode(basename($source));
-    StartLoadDump($request, fmt("Loading '%s'",
-    	HTML(dirname($source),
-             dirname($source) ? "/" : "",
-             WikiLink($page,'auto'))));
+    StartLoadDump($request, 
+    	sprintf(_("Loading '%s'"), $source));
     LoadAny($request, $source);
     EndLoadDump($request);
 }

Modified: trunk/src/plugins/wiki/www/lib/main.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/main.php	2010-11-10 19:41:45 UTC (rev 11499)
+++ trunk/src/plugins/wiki/www/lib/main.php	2010-11-10 20:11:45 UTC (rev 11500)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-// rcs_id('$Id: main.php 7664 2010-08-31 15:42:34Z vargenau $');
+// rcs_id('$Id: main.php 7737 2010-11-10 08:47:34Z rurban $');
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -1327,8 +1327,9 @@
 
 function main () {
 
-    if (version_compare(PHP_VERSION, '4.3.10', '<')) {
-        exit(_("Your PHP version is too old. You must have at least PHP 4.3.10"));
+    // latest supported: Red Hat Enterprise Linux ES release 4
+    if (version_compare(PHP_VERSION, '4.3.9', '<')) {
+        exit(_("Your PHP version is too old. You must have at least PHP 4.3.9"));
     }
 
     if ( !USE_DB_SESSION )




More information about the Fusionforge-commits mailing list