Merge branch 'MDL-38373_23' of git://github.com/stronk7/moodle into M…

…OODLE_23_STABLE
moodle · Mar 20, 2013 · d3a9460 · d3a9460
2 parents 417c261 + d312ce8
commit d3a9460
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/pear/Auth/RADIUS.php b/lib/pear/Auth/RADIUS.php
@@ -46,7 +46,7 @@
 * @version $Revision$
 */
 
-PEAR::loadExtension('radius');
+// PEAR::loadExtension('radius'); // Moodle commented. See MDL-38373.
 
 /**
  * class Auth_RADIUS
@@ -127,6 +127,7 @@ class Auth_RADIUS extends PEAR {
      */
     function Auth_RADIUS()
     {
+        $this->loadExtension('radius'); // Moodle added. See MDL-38373.
         $this->PEAR();
     }
 

diff --git a/lib/pear/README_MOODLE.txt b/lib/pear/README_MOODLE.txt
@@ -1,6 +1,12 @@
 MOODLE-SPECIFIC PEAR MODIFICATIONS
 ==================================
 
+Auth/RADIUS
+===========
+
+1/ Changed static call to correct alternative (MDL-38373):
+    - From: PEAR::loadExtension('radius'); (in global scope)
+    - To: $this->loadExtension('radius'); (in constructor)
 
 Spreadsheet/Excel
 =================