From 5d900e4b6f6de4162be91cf5322c9189d592b6d5 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 6 Jun 2005 00:52:52 +0000 Subject: [PATCH] r236: Using a UNION ALL for the locale and phrase fetch. MySQL minimum requirement is 4.0.0. --- includes/init.php | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/includes/init.php b/includes/init.php index f547173..44325a0 100755 --- a/includes/init.php +++ b/includes/init.php @@ -132,36 +132,17 @@ $bugsys->options['lang_dir'] = $language['direction']; $bugsys->options['lang_code'] = $language['languagecode']; // ################################################################### -// load master language -/* -// can't use this because not everyone has MySQL >= 4.0.17 ... one day, one day +// load language information $phrases = $db->query(" (SELECT varname, phrasetext FROM " . TABLE_PREFIX . "phrase) - UNION DISTINCT - (SELECT varname AS lvarname, phrasetext AS lphrasetext FROM " . TABLE_PREFIX . "locale AS locale WHERE languageid = " . $bugsys->options['lang_id'] . ")" + UNION ALL + (SELECT varname, phrasetext FROM " . TABLE_PREFIX . "locale WHERE languageid = " . $bugsys->options['lang_id'] . ")" ); while ($phrase = $db->fetch_array($phrases)) { $bugsys->language["$phrase[varname]"] = $phrase['phrasetext']; } $db->free_result($phrases); -*/ - -$phrases = $db->query("SELECT * FROM " . TABLE_PREFIX . "phrase"); -while ($phrase = $db->fetch_array($phrases)) -{ - $bugsys->language["$phrase[varname]"] = $phrase['phrasetext']; -} -$db->free_result($phrases); - -// ################################################################### -// load locale data -$locale = $db->query("SELECT * FROM " . TABLE_PREFIX . "locale WHERE languageid = " . intval($bugsys->options['lang_id'])); -while ($phrase = $db->fetch_array($locale)) -{ - $bugsys->language["$phrase[varname]"] = $phrase['phrasetext']; -} -$db->free_result($phrases); // ################################################################### // Initialize usergroup system -- 2.22.5