Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 343112: @Bugzilla::Config::parampanels is only defined if something calls _load_params

Browse Source 
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave
This commit is contained in:
mkanat%bugzilla.org 2006-07-03 21:23:26 +00:00
parent 5fbab746a5
commit e6d3274bc8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webtools/bugzilla/Bugzilla/Config.pm
View File

@ -35,8 +35,6 @@ use strict;
use base qw(Exporter);
use Bugzilla::Constants;
our @parampanels = ();
# Module stuff
@Bugzilla::Config::EXPORT = qw(Param);
@ -48,9 +46,8 @@ our @parampanels = ();
admin => [qw(UpdateParams SetParam WriteParams)],
db => [qw($db_driver $db_host $db_port $db_name $db_user $db_pass $db_sock)],
localconfig => [qw($cvsbin $interdiffbin $diffpath $webservergroup)],
params => [qw(@parampanels)],
);
Exporter::export_ok_tags('admin', 'db', 'localconfig', 'params');
Exporter::export_ok_tags('admin', 'db', 'localconfig');
use vars qw(@param_list);
@ -71,17 +68,12 @@ do $localconfig;
my %params;
# Load in the param definitions
sub _load_params {
my $libpath = bz_locations()->{'libpath'};
foreach my $item ((glob "$libpath/Bugzilla/Config/*.pm")) {
$item =~ m#/([^/]+)\.pm$#;
my $module = $1;
next if ($module eq 'Common');
require "Bugzilla/Config/$module.pm";
foreach my $module (param_panels()) {
eval("require Bugzilla::Config::$module") || die $@;
my @new_param_list = "Bugzilla::Config::$module"->get_param_list();
foreach my $item (@new_param_list) {
$params{$item->{'name'}} = $item;
}
push(@parampanels, $module);
push(@param_list, @new_param_list);
}
}
@ -89,6 +81,17 @@ sub _load_params {
# Subroutines go here
sub param_panels {
my @param_panels;
my $libpath = bz_locations()->{'libpath'};
foreach my $item ((glob "$libpath/Bugzilla/Config/*.pm")) {
$item =~ m#/([^/]+)\.pm$#;
my $module = $1;
push(@param_panels, $module) unless $module eq 'Common';
}
return @param_panels;
}
sub Param {
my ($param) = @_;

9
webtools/bugzilla/editparams.cgi
View File

@ -27,13 +27,11 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Config qw(:DEFAULT :admin :params);
use Bugzilla::Config qw(:DEFAULT :admin);
use Bugzilla::Config::Common;
use Bugzilla::Util;
use Bugzilla::Error;
use vars qw(@parampanels);
my $user = Bugzilla->login(LOGIN_REQUIRED);
my $cgi = Bugzilla->cgi;
my $template = Bugzilla->template;
@ -53,9 +51,8 @@ $current_panel = $1;
my $current_module;
my @panels = ();
foreach my $panel (@parampanels) {
next if ($panel eq 'Common');
require "Bugzilla/Config/$panel.pm";
foreach my $panel (Bugzilla::Config::param_panels()) {
eval("require Bugzilla::Config::$panel") || die $@;
my @module_param_list = "Bugzilla::Config::${panel}"->get_param_list(1);
my $item = { name => lc($panel),
current => ($current_panel eq lc($panel)) ? 1 : 0,