diff --git a/lib/customcheckslib.php b/lib/customcheckslib.php
index 38c36f59f39..ead8e83ce84 100644
--- a/lib/customcheckslib.php
+++ b/lib/customcheckslib.php
@@ -35,15 +35,23 @@
 ///     - false: if failed
 
 /**
- * This function will look for some risky PHP settings combinations
- * in order to inform about.
+ * This function will look for the risky PHP setting register_globals
+ * in order to inform about. MDL-12914
  *
  * @param $result the environment_results object to be modified
  * @return mixed null if the test is irrelevant or environment_results object with
  *               status set to true (test passed) or false (test failed)
  */
-function php_check_register_globals_and_fopen($result) {
-    return null;
+function php_check_register_globals($result) {
+
+/// Check for register_globals. If enabled, security warning
+    if (ini_get_bool('register_globals')) {
+        $result->status = false;
+    } else {
+        $result = null;
+    }
+
+    return $result;
 }
 
 ?>