From c41117346f48774e5c6731303702b5ce98db517b Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 21 Jun 2006 07:44:46 +0000
Subject: Bug 282121: Remove globals.pl from scripts that no longer use it -
 Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=myk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Attachment.pm | 3 ---
 Bugzilla/Config.pm     | 7 ++-----
 Bugzilla/Token.pm      | 3 ---
 3 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 40231aa6c..a7961d764 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -47,9 +47,6 @@ that users upload to the Bugzilla server.
 
 =cut
 
-# This module requires that its caller have said "require globals.pl"
-# to import relevant functions from that script.
-
 use Bugzilla::Error;
 use Bugzilla::Flag;
 use Bugzilla::Config qw(:locations Param);
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index 3f5b788c2..cb20fad24 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -79,19 +79,16 @@ our @parampanels = ();
 # Don't export localvars by default - people should have to explicitly
 # ask for it, as a (probably futile) attempt to stop code using it
 # when it shouldn't
-# ChmodDataFile is here until that stuff all moves out of globals.pl
-# into this file
-@Bugzilla::Config::EXPORT_OK = qw(ChmodDataFile);
-
 %Bugzilla::Config::EXPORT_TAGS =
   (
    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)],
    locations => [qw($libpath $localconfig $attachdir $datadir $templatedir
                     $webdotdir $project $extensionsdir)],
    params => [qw(@parampanels)],
   );
-Exporter::export_ok_tags('admin', 'db', 'locations', 'params');
+Exporter::export_ok_tags('admin', 'db', 'localconfig', 'locations', 'params');
 
 # Bugzilla version
 $Bugzilla::Config::VERSION = "2.23.1+";
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 3cb4d6ffc..40eef4f1b 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -37,9 +37,6 @@ use Bugzilla::Util;
 use Date::Format;
 use Date::Parse;
 
-# This module requires that its caller have said "require globals.pl" to import
-# relevant functions from that script.
-
 ################################################################################
 # Constants
 ################################################################################
-- 
cgit v1.2.3-24-g4f1b