MDL-12983 Installation stops after trying to download Language-Pack - patch by Dan...

diff --git a/install.php b/install.php
index 065547afb88f0fe2653cba2849e83003160cd94f..cade4969a8f1c22a1119b6a4cfbd256539ea7d2f 100644 (file)
--- a/install.php
+++ b/install.php
@@ -473,7 +473,7 @@ if ($INSTALL['stage'] == DOWNLOADLANG && $INSTALL['downloadlangpack']) {
             case COMPONENT_ERROR:
                 if ($cd->get_error() == 'remotedownloaderror') {
                     $a = new stdClass();
-                    $a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
+                    $a->url = 'http://download.moodle.org/lang16/'.$INSTALL['language'].'.zip';
                     $a->dest= $CFG->dataroot.'/lang';
                     $downloaderror = get_string($cd->get_error(), 'error', $a);
                 } else {

diff --git a/lib/setup.php b/lib/setup.php
index 98c5909b0cc710cb545a7ca590d3ed76775bbc00..366f394d206ada4cd902816e0fdb42c6f2d17635 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -488,8 +488,6 @@ global $HTTPSPAGEREQUIRED;
 
 /// Load up global environment variables
 
-    class object {};
-
     //discard session ID from POST, GET and globals to tighten security,
     //this session fixation prevention can not be used in cookieless mode
     if (empty($CFG->usesid)) {

diff --git a/lib/setuplib.php b/lib/setuplib.php
index 875427a94c66cd1d42bc41490b945b72c36444a9..b076a9a8c9881695537eca82c2cf43bb1c6d7cb0 100644 (file)
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -4,6 +4,12 @@
       // loaded.
 
 
+/**
+ * Simple class
+ */
+class object {};
+
+
 /**
  * Initializes our performance info early.
  *