r703: language.isdefault is no longer how we see what language to use; we now have...

diff --git a/admin/language.php b/admin/language.php
index f04aa976fbabc74b2ec34fda42eff04baa21d7c7..5d9c7bd497ad28f45cfe4f7bcba049466c0e0161 100644 (file)
--- a/admin/language.php
+++ b/admin/language.php
@@ -35,8 +35,7 @@ if ($_REQUEST['do'] == 'kill')
                $admin->error($lang->string('At least one language needs to be present. Deleting this language would violate that.'));
        }
        
-       $language = $db->query_first("SELECT * FROM language WHERE languageid = " . intval($bugsys->in['languageid']));
-       if ($language['isdefault'])
+       if ($bugsys->options['defaultlanguage'] == intval($bugsys->in['languageid']))
        {
                $admin->error($lang->string('You cannot delete the default language. Please select another language to be the default language and then delete this one.'));
        }
@@ -185,7 +184,7 @@ if ($_REQUEST['do'] == 'modify')
                $admin->row_multi_item(array(
                        $language['title'] => 'l',
                        $language['charset'] => 'c',
-                       (($language['isdefault']) ? '<strong>' . $lang->string('DEFAULT LANGUAGE') . '</strong> / ' : '') . ($language['userselect'] ? $lang->string('User Selectable') : $lang->string('Private')) => 'c',
+                       (($bugsys->options['defaultlanguage'] == $language['languageid']) ? '<strong>' . $lang->string('DEFAULT LANGUAGE') . '</strong> / ' : '') . ($language['userselect'] ? $lang->string('User Selectable') : $lang->string('Private')) => 'c',
                        "<a href=\"language.php?do=edit&amp;languageid=$language[languageid]\">[" . $lang->string('Edit Settings') . "]</a> <a href=\"language.php?do=reload&amp;languageid=$language[languageid]\">[" . $lang->string('Reload XML') . "]</a>" => 'c'
                ));
        }

diff --git a/docs/schema_changes.sql b/docs/schema_changes.sql
index 85493825bd74a105772a803648bc73a4823418e6..9803a48a7956fcf417d0232a6e1c2ba6ef3ee572 100644 (file)
--- a/docs/schema_changes.sql
+++ b/docs/schema_changes.sql
@@ -14,4 +14,6 @@ CREATE TABLE `fieldhelp` (
 
 ALTER TABLE `fieldhelp` ADD PRIMARY KEY(`keystring`);
 
-ALTER TABLE `language` CHANGE `default` `isdefault` INT(2) UNSIGNED NOT NULL DEFAULT '0';
\ No newline at end of file
+ALTER TABLE `language` CHANGE `default` `isdefault` INT(2) UNSIGNED NOT NULL DEFAULT '0';
+
+ALTER TABLE `language` DROP `isdefault`;
\ No newline at end of file

diff --git a/includes/language.php b/includes/language.php
index 006c219d52e74f6286c710092d7fd60c0b7757b9..8fab2d29a0a665f26792d2c5208e83740d9a5fe7 100644 (file)
--- a/includes/language.php
+++ b/includes/language.php
@@ -95,7 +95,7 @@ function fetch_user_language()
        {
                foreach ($bugsys->datastore['language'] AS $language)
                {
-                       if ($language['isdefault'])
+                       if ($bugsys->options['defaultlanguage'] == $language['languageid'])
                        {
                                $languageid = $language['languageid'];
                                $language = $bugsys->datastore['language']["$languageid"];

diff --git a/includes/settings.php b/includes/settings.php
index 14dbea00ab3405c136181b3c449f3c92b6b7c65c..82264d8126f047b83fd107874809c54db0082c3b 100755 (executable)
--- a/includes/settings.php
+++ b/includes/settings.php
@@ -38,6 +38,7 @@ $config['webmasteremail']             =       array('general', 'webmasteremail', 'textbox', '', f
 $config['trackertitle']                        =       array('general', 'trackertitle', 'textbox', '', false, $lang->string('Tracker Title'), $lang->string('The global name of the bug tracker. Example: Iris Studios Bug Tracker'));
 $config['trackerurl']                  =       array('general', 'trackerurl', 'textbox', '', false, $lang->string('Tracker Base URL'), $lang->string('The base URL of the tracker. This is used when creating external links to the tracker. <strong>Be sure that this does not end in a trailing slash (&quot;/&quot;).</strong><br />Example: http://www.iris-studios.com/bugs'));
 $config['dateformat']                  =       array('general', 'dateformat', 'textbox', 'F j, Y h:i:s A', false, $lang->string('Date Format'), $lang->string('Set the date format used for bug report and comment information. This is based on PHP\'s date() function.'));
+$config['defaultlanguage']             =       array('general', 'defaultlanguage', '" . construct_option_select(\'setting[defaultlanguage]\', $bugsys->datastore[\'language\'], $bugsys->options[\'defaultlanguage\'], \'languageid\', \'title\') . "', 1, false, $lang->string('Default Language'), $lang->string('You can set the default language that all new users (and guests) will use.'));
 
 // ###################################################################