[phpwiki-checkins] SF.net SVN: phpwiki:[6938] trunk/lib/config.php

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

Revision: 6938
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6938&view=rev
Author:   rurban
Date:     2009-06-15 15:06:51 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
set_magic_quotes_runtime fix for php6.
Do not update the default english/C locale, this is default.

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2009-06-15 13:25:25 UTC (rev 6937)
+++ trunk/lib/config.php	2009-06-15 15:06:51 UTC (rev 6938)
@@ -45,7 +45,8 @@
 */
 
 // essential internal stuff
-set_magic_quotes_runtime(0);
+if (!check_php_version(6))
+    set_magic_quotes_runtime(0);
 
 /**
  * Browser Detection Functions
@@ -279,6 +280,7 @@
 
 // [99ms]
 function update_locale($loc) {
+    if ($loc == 'C' or $loc == 'en') return;
     // $LANG or DEFAULT_LANGUAGE is too less information, at least on unix for
     // setlocale(), for bindtextdomain() to succeed.
     $setlocale = guessing_setlocale(LC_ALL, $loc); // [56ms]


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