[phpwiki-checkins] SF.net SVN: phpwiki:[7475] trunk/lib/main.php

[<ru...@us...>]

Revision: 7475
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7475&view=rev
Author:   rurban
Date:     2010-06-07 11:42:44 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
READONLY might be deferred

Modified Paths:
--------------
    trunk/lib/main.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-06-07 11:00:26 UTC (rev 7474)
+++ trunk/lib/main.php	2010-06-07 11:42:44 UTC (rev 7475)
@@ -79,7 +79,7 @@
         if (USE_DB_SESSION) {
             include_once('lib/DbSession.php');
             $dbi =& $this->_dbi;
-            if (!READONLY)
+            if (defined('READONLY') and !READONLY) // READONLY might be set later
                 $this->_dbsession = new DbSession($dbi, $dbi->getParam('prefix') 
                                                   . $dbi->getParam('db_session_table'));
         }
@@ -201,7 +201,8 @@
         }
         if (empty($WikiTheme) and $user_theme) {
             if (strcspn($user_theme,"./\x00]") != strlen($user_theme)) {
-            	trigger_error(sprintf("invalid theme '%s': Invalid characters detected", $user_theme),
+            	trigger_error(sprintf("invalid theme '%s': Invalid characters detected",
+            	                      $user_theme),
             	              E_USER_WARNING);
                 $user_theme = "default";
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.