From f16e7519ebcaf7c3523b0d34166981b6d8294cda Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 17 Mar 2007 18:25:02 +0000
Subject: [PATCH] r1471: Fix for bug://report/69: In install/global.php, move
 the loading of the includes/language.php to be higher up so that the gettext
 emulation system is enabled sooner

---
 docs/changes.txt   | 1 +
 install/global.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index e60382f..0b772a5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -2,6 +2,7 @@
 ===============================
 - Fixed: Emails wouldn't be sent out for new comments due to a bug with updating the notices array
 - Fixed: Searches wouldn't be rerun after 15 minutes because of a typo in the time calculation
+- Fixed: The installer would show an error if gettext wasn't installed because the emulator wasn't loaded early enough
 
 1.2.0 Beta 1
 ===============================
diff --git a/install/global.php b/install/global.php
index 755a29f..4d3745c 100644
--- a/install/global.php
+++ b/install/global.php
@@ -33,7 +33,7 @@ require_once('./framework/kernel.php');
 $bugsys = new ISSO;
 $bugsys->setAppPath(getcwd());
 $bugsys->setApplication('Bugdar');
-$bugsys->setAppVersion('[#]verson[#]');
+$bugsys->setAppVersion('[#]version[#]');
 
 if (!file_exists('./includes/config.php'))
 {
@@ -60,8 +60,8 @@ unset($database, $servername, $username, $password, $usepconnect, $tableprefix,
 
 require_once('./includes/functions_datastore.php');
 require_once('./includes/functions.php');
-require_once('./includes/permissions.php');
 require_once('./includes/language.php');
+require_once('./includes/permissions.php');
 
 // ###################################################################
 // init the big three
-- 
2.22.5