Index: setuplib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/setuplib.php,v
retrieving revision 1.22.2.3
diff -u -r1.22.2.3 setuplib.php
--- setuplib.php	20 Dec 2007 23:16:51 -0000	1.22.2.3
+++ setuplib.php	14 Jan 2008 14:47:58 -0000
@@ -1,8 +1,9 @@
-<?php // $Id$ 
+<?php // $Id: setuplib.php,v 1.22.2.3 2007/12/20 23:16:51 stronk7 Exp $ 
       // These functions are required very early in the Moodle 
       // setup process, before any of the main libraries are 
       // loaded.
 
+class object {};
 
 /**
  * Initializes our performance info early.
Index: setup.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/setup.php,v
retrieving revision 1.212.2.5
diff -u -r1.212.2.5 setup.php
--- setup.php	6 Jan 2008 22:56:11 -0000	1.212.2.5
+++ setup.php	14 Jan 2008 14:47:58 -0000
@@ -5,7 +5,7 @@
  * Normally this is only called by the main config.php file
  * Normally this file does not need to be edited.
  * @author Martin Dougiamas
- * @version $Id$
+ * @version $Id: setup.php,v 1.212.2.5 2008/01/06 22:56:11 martinlanghoff Exp $
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  * @package moodlecore
  */
@@ -488,7 +488,6 @@
 
 /// 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
Index: ../install.php
===================================================================
RCS file: /cvsroot/moodle/moodle/install.php,v
retrieving revision 1.80.2.8
diff -u -r1.80.2.8 install.php
--- ../install.php	8 Jan 2008 07:15:29 -0000	1.80.2.8
+++ ../install.php	14 Jan 2008 14:47:58 -0000
@@ -473,7 +473,7 @@
             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 {