Browse files

BUGFIX Ensure the SS3 installer checks for CType support in PHP, as l…

…anguage YAML parser uses this in framework.
  • Loading branch information...
1 parent ef8651d commit cc339c37c4a64ce421a8c4ce12cf9fd728658b6f @halkyon halkyon committed Apr 22, 2012
Showing with 6 additions and 3 deletions.
  1. +6 −3 dev/install/install.php5
View
9 dev/install/install.php5
@@ -440,7 +440,10 @@ class InstallRequirements {
$this->requireClass('DOMDocument', array("PHP Configuration", "DOM/XML support", "DOM/XML support not included in PHP."));
// Check for token_get_all
- $this->requireFunction('token_get_all', array("PHP Configuration", "PHP Tokenizer", "PHP tokenizer support not included in PHP."));
+ $this->requireFunction('token_get_all', array("PHP Configuration", "Tokenizer support", "Tokenizer support not included in PHP."));
+
+ // Check for CType support
+ $this->requireFunction('ctype_digit', array('PHP Configuration', 'CType support', 'CType support not included in PHP.'));
// Check for session support
$this->requireFunction('session_start', array('PHP Configuration', 'Session support', 'Session support not included in PHP.'));
@@ -955,15 +958,15 @@ class InstallRequirements {
$section = $testDetails[0];
$test = $testDetails[1];
- $this->tests[$section][$test] = array("error", $testDetails[2]);
+ $this->tests[$section][$test] = array("error", @$testDetails[2]);
$this->errors[] = $testDetails;
}
function warning($testDetails) {
$section = $testDetails[0];
$test = $testDetails[1];
- $this->tests[$section][$test] = array("warning", $testDetails[2]);
+ $this->tests[$section][$test] = array("warning", @$testDetails[2]);
$this->warnings[] = $testDetails;
}

0 comments on commit cc339c3

Please sign in to comment.