r1521: We need to move up the loading of includes/language.php in init.php so that...

diff --git a/docs/changes.txt b/docs/changes.txt
index 12a59de2645bf9137a209441b9aeb91dfdf60a80..9ce820a97b2c06e29448230c7754b4bc6084756f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,3 +1,7 @@
+1.2.0 Beta 3
+===============================
+- Fixed: If Gettext isn't installed, a function-not-found error would be thrown
+
 1.2.0 Beta 2
 ===============================
 - Fixed: Emails wouldn't be sent out for new comments due to a bug with updating the notices array

diff --git a/includes/init.php b/includes/init.php
index 05bc1711e527cb46fd6d66816edd93a06aaa2ec4..0cb7ce4a117656197c28df8efd9c48d9bdf918c7 100755 (executable)
--- a/includes/init.php
+++ b/includes/init.php
@@ -62,6 +62,7 @@ unset($database, $servername, $theuser, $password, $thepass, $usepconnect, $tabl
 
 require_once('./includes/functions_datastore.php');
 require_once('./includes/functions.php');
+require_once('./includes/language.php');
 
 // ###################################################################
 // init the big three
@@ -128,8 +129,6 @@ else
 // ###################################################################
 // initialize localization system
 
-require_once('./includes/language.php');
-
 $language = fetch_user_language();
 
 $stylevar['lang'] = $language['langcode'];