3 files changed, 13 insertions, 12 deletions

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 6eac5c94b..ecc430cb5 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -26,7 +26,7 @@ use base qw(Exporter);
 
 @Bugzilla::Error::EXPORT = qw(ThrowCodeError ThrowTemplateError ThrowUserError);
 
-use Bugzilla::Config;
+use Bugzilla::Config qw($datadir);
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Date::Format;
@@ -42,8 +42,8 @@ sub _throw_error {
     # and the transaction is rolled back (if supported)
     Bugzilla->dbh->bz_unlock_tables(UNLOCK_ABORT);
 
-    # If a writable data/errorlog exists, log error details there.
-    if (-w "data/errorlog") {
+    # If a writable $datadir/errorlog exists, log error details there.
+    if (-w "$datadir/errorlog") {
         require Data::Dumper;
         my $mesg = "";
         for (1..75) { $mesg .= "-"; };
@@ -67,7 +67,7 @@ sub _throw_error {
             $val = "*****" if $val =~ /password|http_pass/i;
             $mesg .= "[$$] " . Data::Dumper->Dump([$val],["env($var)"]);
         }
-        open(ERRORLOGFID, ">>data/errorlog");
+        open(ERRORLOGFID, ">>$datadir/errorlog");
         print ERRORLOGFID "$mesg\n";
         close ERRORLOGFID;
     }
diff --git a/editclassifications.cgi b/editclassifications.cgi
index 0e8ffde99..9dad9ae37 100755
--- a/editclassifications.cgi
+++ b/editclassifications.cgi
@@ -27,7 +27,7 @@ use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Error;
-use Bugzilla::Config;
+use Bugzilla::Config qw($datadir);
 
 require "globals.pl";
 
@@ -166,7 +166,7 @@ if ($action eq 'new') {
     $sth->execute($classification,$description);
 
     # Make versioncache flush
-    unlink "data/versioncache";
+    unlink "$datadir/versioncache";
 
     LoadTemplate($action);
 }
@@ -230,7 +230,7 @@ if ($action eq 'delete') {
 
     $dbh->bz_unlock_tables();
 
-    unlink "data/versioncache";
+    unlink "$datadir/versioncache";
 
     LoadTemplate($action);
 }
@@ -320,7 +320,7 @@ if ($action eq 'update') {
 
     $dbh->bz_unlock_tables();
 
-    unlink "data/versioncache";
+    unlink "$datadir/versioncache";
     LoadTemplate($action);
 }
 
diff --git a/testserver.pl b/testserver.pl
index eb9372084..a6573c8bc 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -19,6 +19,7 @@
 # issues as possible.
 
 use Socket;
+use Bugzilla::Config qw($datadir);
 my $envpath = $ENV{'PATH'};
 use lib ".";
 use strict;
@@ -165,8 +166,8 @@ if ($@ eq '') {
         $image->fill(50, 50, $red);
 
         if ($image->can('png')) {
-            create_file('data/testgd-local.png', $image->png);
-            check_image('data/testgd-local.png', 't/testgd.png', 'GD', 'PNG');
+            create_file("$datadir/testgd-local.png", $image->png);
+            check_image("$datadir/testgd-local.png", 't/testgd.png', 'GD', 'PNG');
         } else {
             die "GD doesn't support PNG generation\n";
         }
@@ -188,8 +189,8 @@ if ($@ eq '') {
             $chart->add_pt('bar', 16, 32);
 
             my $type = $chart->can('gif') ? 'gif' : 'png';
-            $chart->$type("data/testchart-local.$type");
-            check_image("data/testchart-local.$type", "t/testchart.$type",
+            $chart->$type("$datadir/testchart-local.$type");
+            check_image("$datadir/testchart-local.$type", "t/testchart.$type",
                 "Chart", uc($type));
         };
         if ($@ ne '') {