r701: Changing language.default to language.isdefault

diff --git a/admin/language.php b/admin/language.php
index badc8a1479870b17be6d0b797f4c96ffd6cb27b2..f04aa976fbabc74b2ec34fda42eff04baa21d7c7 100644 (file)
--- a/admin/language.php
+++ b/admin/language.php
@@ -36,7 +36,7 @@ if ($_REQUEST['do'] == 'kill')
        }
        
        $language = $db->query_first("SELECT * FROM language WHERE languageid = " . intval($bugsys->in['languageid']));
-       if ($language['default'])
+       if ($language['isdefault'])
        {
                $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 +185,7 @@ if ($_REQUEST['do'] == 'modify')
                $admin->row_multi_item(array(
                        $language['title'] => 'l',
                        $language['charset'] => 'c',
-                       (($language['default']) ? '<strong>' . $lang->string('DEFAULT LANGUAGE') . '</strong> / ' : '') . ($language['userselect'] ? $lang->string('User Selectable') : $lang->string('Private')) => 'c',
+                       (($language['isdefault']) ? '<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 e6737d53020a7e51255dbc214d463ef030f74c36..85493825bd74a105772a803648bc73a4823418e6 100644 (file)
--- a/docs/schema_changes.sql
+++ b/docs/schema_changes.sql
@@ -12,4 +12,6 @@ CREATE TABLE `fieldhelp` (
   `body` MEDIUMTEXT NOT NULL
 );
 
-ALTER TABLE `fieldhelp` ADD PRIMARY KEY(`keystring`);
\ No newline at end of file
+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

diff --git a/includes/language.php b/includes/language.php
index fa1376c6153f060b1f5799496ba1eba40056e7e0..006c219d52e74f6286c710092d7fd60c0b7757b9 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['default'])
+                       if ($language['isdefault'])
                        {
                                $languageid = $language['languageid'];
                                $language = $bugsys->datastore['language']["$languageid"];