← Back to branch summary

~dangarner/xibo/translate-xibo

« back to all changes in this revision

Viewing changes to server/upgrade.php

  • Committer: Dan Garner
  • Date: 2009-05-18 21:20:33 UTC
  • Revision ID: mail@dangarner.co.uk-20090518212033-7emy7ebg3t8bgcic
[server] Fixed error in installer and upgrade.php (installer included checkPhp function twice and upgrade.php initialised the translations in the wrong place

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/upgrade.php
31
31
 
32
32
// Setup the translations for gettext
33
33
require_once("lib/app/translationengine.class.php");
34
 
TranslationEngine::InitLocale($db);
35
 
 
36
34
 
37
35
// Once we've calculated the upgrade in step 2 below, we need
38
36
// to have included the appropriate upgrade php files
68
66
if (!$db->connect_db($dbhost, $dbuser, $dbpass)) reportError(0, __("Unable to connect to the MySQL database using the settings stored in settings.php.") . "<br /><br />" . __("MySQL Error:") . "<br />" . $db->error());
69
67
if (!$db->select_db($dbname)) reportError(0, __("Unable to select the MySQL database using the settings stored in settings.php.") . "<br /><br />" . __("MySQL Error:") . "<br />" . $db->error());
70
68
 
 
69
// Initialise the Translations
 
70
TranslationEngine::InitLocale($db);
 
71
 
71
72
include('install/header_upgrade.inc');
72
73
 
73
74
if (! $_SESSION['step']) {