Permalink
Browse files

Merge branch 'MDL-25186_m20a' of git://github.com/rwijaya/moodle

  • Loading branch information...
2 parents 3b8929e + 39f2bbf commit 9bb5a6f037b48dbf8c8816addba6b5764d98b34c @skodak skodak committed Dec 27, 2010
Showing with 15 additions and 0 deletions.
  1. +5 −0 admin/environment.xml
  2. +1 −0 lang/en/admin.php
  3. +9 −0 lib/customcheckslib.php
View
5 admin/environment.xml
@@ -321,6 +321,11 @@
</PHP_SETTING>
</PHP_SETTINGS>
<CUSTOM_CHECKS>
+ <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_php533" level="optional">
+ <FEEDBACK>
+ <ON_CHECK message="php533warning" />
+ </FEEDBACK>
+ </CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
View
1 lang/en/admin.php 100755 → 100644
@@ -782,6 +782,7 @@
$string['performance'] = 'Performance';
$string['pgcluster'] = 'PostgreSQL Cluster';
$string['pgclusterdescription'] = 'PostgreSQL version/cluster parameter for command line operations. If you only have one postgresql on your system or you are not sure what this is, leave this blank.';
+$string['php533warning'] = 'PHP 5.3.3 and upwards is recommended';
$string['phpfloatproblem'] = 'Detected unexpected problem in handling of PHP float numbers - {$a}';
$string['php50restricted'] = 'PHP 5.0.x has a number of known problems, please upgrade to 5.1.x or downgrade to 4.3.x or 4.4.x';
$string['pleaserefreshregistration'] = 'Your site has been registered with moodle.org, please consider updating the registration if significant changes happened since your last update, on {$a}';
View
9 lib/customcheckslib.php
@@ -54,3 +54,12 @@ function php_check_register_globals($result) {
return $result;
}
+
+function php_check_php533($result) {
+ if (version_compare(phpversion(), '5.3.3') < 0) {
+ $result->status = false;
+ } else {
+ $result = null;
+ }
+ return $result;
+}

0 comments on commit 9bb5a6f

Please sign in to comment.