Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18546
Modified Files:
Tag: release-1_2-branch
config.php
Log Message:
simplify ini_get by casting to (bool)
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.14
retrieving revision 1.24.2.15
diff -u -2 -b -p -d -r1.24.2.14 -r1.24.2.15
--- config.php 23 Jul 2005 11:13:02 -0000 1.24.2.14
+++ config.php 24 Jul 2005 07:35:40 -0000 1.24.2.15
@@ -7,6 +7,9 @@
set_magic_quotes_runtime(0);
error_reporting(E_ALL ^ E_NOTICE);
- if (!ini_get('register_globals') or (ini_get('register_globals') == 'off')) {
+ if (! (bool)ini_get('register_globals')) {
import_request_variables('gps');
+ if (! (bool)ini_get('register_long_arrays')) {
+ $HTTP_SERVER_VARS =& $_SERVER;
+ }
extract($HTTP_SERVER_VARS);
}
@@ -16,5 +19,5 @@
}
rcs_id('$Id$');
- define('PHPWIKI_VERSION', '1.2.8');
+ define('PHPWIKI_VERSION', '1.2.10');
// end essential internal stuff
@@ -306,5 +309,10 @@
function compute_default_scripturl() {
global $HTTP_SERVER_VARS, $SERVER_PORT, $SERVER_NAME, $SCRIPT_NAME, $HTTPS;
- if (!ini_get('register_globals') or (ini_get('register_globals') == 'off')) {
+
+ if (! (bool)ini_get('register_globals')) {
+ import_request_variables('gps');
+ if (! (bool)ini_get('register_long_arrays')) {
+ $HTTP_SERVER_VARS =& $_SERVER;
+ }
extract($HTTP_SERVER_VARS);
}
|
