tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Checking for mbstring PHP extension support in installer, as it has been a documented installation requirement for a while. Removing method_exists() checks from mbstring usage in core for the same reasons

Browse Source
This commit is contained in:
Ingo Schommer 2012-05-09 10:23:20 +02:00
parent 6f9483cafe
commit 1671b9c65c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Core.php
View File

@ -203,11 +203,9 @@ increase_xdebug_nesting_level_to(200);
/** /**
* Set default encoding * Set default encoding
*/ */
if(function_exists('mb_http_output')) { mb_http_output('UTF-8');
mb_http_output('UTF-8'); mb_internal_encoding('UTF-8');
mb_internal_encoding('UTF-8'); mb_regex_encoding('UTF-8');
mb_regex_encoding('UTF-8');
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// INCLUDES // INCLUDES

5
dev/install/install.php5
View File

@ -431,8 +431,11 @@ class InstallRequirements {
// Check for iconv support // Check for iconv support
$this->requireFunction('iconv', array('PHP Configuration', 'iconv support', 'iconv support not included in PHP.')); $this->requireFunction('iconv', array('PHP Configuration', 'iconv support', 'iconv support not included in PHP.'));
// Check for mbstring support
$this->requireFunction('iconv', array('PHP Configuration', 'iconv support', 'iconv support not included in PHP.'));
// Check for hash support // Check for hash support
$this->requireFunction('hash', array('PHP Configuration', 'hash support', 'hash support not included in PHP.')); $this->requireFunction('mb_internal_encoding', array('PHP Configuration', 'mbstring support', 'mbstring support not included in PHP.'));
// Check for Reflection support // Check for Reflection support
$this->requireClass('ReflectionClass', array('PHP Configuration', 'Reflection support', 'Reflection support not included in PHP.')); $this->requireClass('ReflectionClass', array('PHP Configuration', 'Reflection support', 'Reflection support not included in PHP.'));

2
model/URLSegmentFilter.php
View File

@ -62,7 +62,7 @@ class URLSegmentFilter extends Object {
if($transliterator) $name = $transliterator->toASCII($name); if($transliterator) $name = $transliterator->toASCII($name);
} }
$name = (function_exists('mb_strtolower')) ? mb_strtolower($name) : strtolower($name); $name = mb_strtolower($name);
$replacements = $this->getReplacements(); $replacements = $this->getReplacements();
if($this->getAllowMultibyte()) { if($this->getAllowMultibyte()) {
// unset automated removal of non-ASCII characters, and don't try to transliterate // unset automated removal of non-ASCII characters, and don't try to transliterate