summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%kerio.com <>2005-04-28 01:00:23 +0200
committermkanat%kerio.com <>2005-04-28 01:00:23 +0200
commite1ab613cf4f4324924fe33163b501c1835c5deb4 (patch)
tree9311701fe4f9c8be88883d0014a4d94b625c3000
parent51bb0240866b63bb278974f1ee7bfe1b32dafb1e (diff)
downloadbugzilla-e1ab613cf4f4324924fe33163b501c1835c5deb4.tar.gz
bugzilla-e1ab613cf4f4324924fe33163b501c1835c5deb4.tar.xz
Bug 289012: Can't use an undefined value as a HASH reference at userprefs.cgi line 142.
Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=justdave
-rw-r--r--Bugzilla/User/Setting.pm4
-rwxr-xr-xchecksetup.pl24
2 files changed, 16 insertions, 12 deletions
diff --git a/Bugzilla/User/Setting.pm b/Bugzilla/User/Setting.pm
index a8e1cbaed..2319b8a55 100644
--- a/Bugzilla/User/Setting.pm
+++ b/Bugzilla/User/Setting.pm
@@ -127,7 +127,7 @@ sub add_setting {
sub get_all_settings {
my ($user_id) = @_;
- my $settings;
+ my $settings = {};
my $dbh = Bugzilla->dbh;
my $sth = $dbh->prepare(
@@ -162,7 +162,7 @@ sub get_all_settings {
sub get_defaults {
my $dbh = Bugzilla->dbh;
- my $default_settings;
+ my $default_settings = {};
my $sth = $dbh->prepare(q{SELECT name, default_value, is_enabled
FROM setting
diff --git a/checksetup.pl b/checksetup.pl
index 09e8dc4ba..565fa1e70 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -84,6 +84,7 @@
# add more database-related checks --DATABASE--
# change table definitions --TABLE--
# add more groups --GROUPS--
+# add user-adjustable sttings --SETTINGS--
# create initial administrator account --ADMIN--
#
# Note: sometimes those special comments occur more than once. For
@@ -3772,9 +3773,6 @@ if($dbh->bz_column_info('bugs', 'lastdiffed')->{NOTNULL}) {
$dbh->bz_alter_column('bugs', 'lastdiffed', {TYPE => 'DATETIME'});
}
-# 2005-03-03 travis@sedsystems.ca -- Bug 41972
-add_setting ("display_quips", {"on" => 1, "off" => 2 }, "on" );
-
# 2005-03-09 qa_contact should be NULL instead of 0, bug 285534
if ($dbh->bz_column_info('bugs', 'qa_contact')->{NOTNULL}) {
$dbh->bz_alter_column('bugs', 'qa_contact', {TYPE => 'INT3'});
@@ -3923,13 +3921,6 @@ if ( $dbh->isa('Bugzilla::DB::Mysql') ) {
}
}
-# 2005-03-10 travis@sedsystems.ca -- Bug 199048
-add_setting ("comment_sort_order", {"oldest_to_newest" => 1,
- "newest_to_oldest" => 2,
- "newest_to_oldest_desc_first" => 3},
- "oldest_to_newest" );
-
-
# 2005-04-07 - alt@sonic.net, bug 289455
# make classification_id field type be consistent with DB:Schema
$dbh->bz_alter_column('products', 'classification_id',
@@ -4011,6 +4002,19 @@ if (!GroupDoesExist('bz_canusewhines')) {
}
###########################################################################
+# Create --SETTINGS-- users can adjust
+###########################################################################
+
+# 2005-03-03 travis@sedsystems.ca -- Bug 41972
+add_setting ("display_quips", {"on" => 1, "off" => 2 }, "on" );
+
+# 2005-03-10 travis@sedsystems.ca -- Bug 199048
+add_setting ("comment_sort_order", {"oldest_to_newest" => 1,
+ "newest_to_oldest" => 2,
+ "newest_to_oldest_desc_first" => 3},
+ "oldest_to_newest" );
+
+###########################################################################
# Create Administrator --ADMIN--
###########################################################################