BUGFIX Set default mbstring encoding in Core.php instead of main.php …

…and cli-script.php so phpunit binary test runs behave consistently (same as running through TestRunner+cli-script.php). Fixes URLSegmentFilterTest
silverstripe · Dec 4, 2011 · 755663a · 755663a
1 parent 34686ca
commit 755663a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/cli-script.php b/cli-script.php
@@ -61,12 +61,6 @@
  */
 require_once("core/Core.php");
 
-if(function_exists('mb_http_output')) {
-	mb_http_output('UTF-8');
-	mb_internal_encoding('UTF-8');
-	mb_regex_encoding('UTF-8');
-}
-
 global $databaseConfig;
 
 // We don't have a session in cli-script, but this prevents errors

diff --git a/core/Core.php b/core/Core.php
@@ -195,6 +195,15 @@ function array_fill_keys($keys,$value) {
  */
 increase_memory_limit_to('64M');
 
+/**
+ * Set default encoding
+ */
+if(function_exists('mb_http_output')) {
+	mb_http_output('UTF-8');
+	mb_internal_encoding('UTF-8');
+	mb_regex_encoding('UTF-8');
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // INCLUDES
 

diff --git a/main.php b/main.php
@@ -60,12 +60,6 @@
  */
 require_once("core/Core.php");
 
-if (function_exists('mb_http_output')) {
-	mb_http_output('UTF-8');
-	mb_internal_encoding('UTF-8');
-	mb_regex_encoding('UTF-8');
-}
-
 Session::start();
 
 // IIS will sometimes generate this.