Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 755663a00a1f4bf05ae029d53ade8509f8df9fea 1 parent 34686ca
@chillu chillu authored
Showing with 9 additions and 12 deletions.
  1. +0 −6 cli-script.php
  2. +9 −0 core/Core.php
  3. +0 −6 main.php
View
6 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
View
9 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
View
6 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.
Please sign in to comment.
Something went wrong with that request. Please try again.