Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15691
Modified Files:
serendipity_config.inc.php
Log Message:
* Force 'display_errors' to true if production variable is set to FALSE
* Set production variable to FALSE in all alpha|beta|cvs versions for easier debugging from people of the forums
* Fix mbstring functions, mb_strtoupper is only available since PHP 4.3.0. :(
* Only set smarty debugging vars if production variable is set to 'debug' manually.
Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_config.inc.php 10 Dec 2004 10:59:05 -0000 1.114
+++ serendipity_config.inc.php 10 Dec 2004 16:47:29 -0000 1.115
@@ -15,18 +15,28 @@
include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
+// The version string
$serendipity['version'] = '0.8-alpha7';
-$serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
-$serendipity['production'] = true; // Setting this to 'false' will enable debugging output
-$serendipity['rewrite'] = 'none';
-$serendipity['messagestack'] = array();
-if ($serendipity['production'] == 1) {
+// Name of folder for the default theme
+$serendipity['defaultTemplate'] = 'default';
+
+// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
+$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
+
+if ($serendipity['production'] == true) {
error_reporting(E_ALL & ~E_NOTICE);
} else {
error_reporting(E_ALL);
+ @ini_set('display_errors', 'on');
}
+// Default rewrite method
+$serendipity['rewrite'] = 'none';
+
+// Message container
+$serendipity['messagestack'] = array();
+
// Can the user change the date of publishing for an entry?
$serendipity['allowDateManipulation'] = true;
@@ -215,7 +225,7 @@
* Check if the installed version is higher than the version of the config
*/
-if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) {
+if (IS_up2date === false && !defined('IN_upgrader')) {
die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php'));
}
|
