Funktionslokale Variablen nicht als global deklarieren.

Fix für Bugs 1251 und 1253. Hintergrund: Die DB-Upgradescripte werden
mittels eval im Kontext einer Unterfunktion aufgerufen. Die Variablen,
die fälschlicherweise innerhalb der Upgradescripte mit "our" als
global deklariert wurden, sind aber innerhalb der Unterfunktion, aus
der sie ge-eval-t werden, nur mit "my" deklariert worden.

Falls das nun einige der automatischen Tests fehlschlagen lassen
sollte, dann müsste sich das Sven bitte nochmal ansehen.

diff --git a/sql/Pg-upgrade2/USTVA_abstraction.pl b/sql/Pg-upgrade2/USTVA_abstraction.pl
index 83dffc6..96c6b73 100644 (file)
--- a/sql/Pg-upgrade2/USTVA_abstraction.pl
+++ b/sql/Pg-upgrade2/USTVA_abstraction.pl
@@ -12,9 +12,6 @@ use strict;
 
 die("This script cannot be run from the command line.") unless ($main::form);
 
-# import vars from caller
-our ($dbup_locale, $dbup_myconfig, $dbh, $iconv);
-
 sub mydberror {
   my ($msg) = @_;
   die($dbup_locale->text("Database update error:") .

diff --git a/sql/Pg-upgrade2/USTVA_at.pl b/sql/Pg-upgrade2/USTVA_at.pl
index 0ad72a0..24fa608 100644 (file)
--- a/sql/Pg-upgrade2/USTVA_at.pl
+++ b/sql/Pg-upgrade2/USTVA_at.pl
@@ -8,9 +8,6 @@ unless ( $main::form ) {
   die("This script cannot be run from the command line.");
 }
 
-# import vars from caller
-our ($dbup_locale, $dbup_myconfig, $dbh, $iconv);
-
 if ( check_coa('Austria') ){
 
   if ( coa_is_empty() )  {

diff --git a/sql/Pg-upgrade2/cp_greeting_migration.pl b/sql/Pg-upgrade2/cp_greeting_migration.pl
index 40c1ebd..3b978a5 100644 (file)
--- a/sql/Pg-upgrade2/cp_greeting_migration.pl
+++ b/sql/Pg-upgrade2/cp_greeting_migration.pl
@@ -6,9 +6,6 @@ use strict;
 
 die("This script cannot be run from the command line.") unless ($main::form);
 
-# import vars from caller
-our ($dbup_locale, $dbup_myconfig, $dbh, $iconv);
-
 sub mydberror {
   my ($msg) = @_;
   die($dbup_locale->text("Database update error:") .

diff --git a/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.pl b/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.pl
index 6edd14d..608e442 100644 (file)
--- a/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.pl
+++ b/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.pl
@@ -4,9 +4,6 @@
 
 use strict;
 
-# import vars from caller
-our ($dbup_locale, $dbup_myconfig, $dbh);
-
 die("This script cannot be run from the command line.") unless ($main::form);
 
 sub mydberror {

diff --git a/sql/Pg-upgrade2/warehouse.pl b/sql/Pg-upgrade2/warehouse.pl
index 725758f..a9b152f 100644 (file)
--- a/sql/Pg-upgrade2/warehouse.pl
+++ b/sql/Pg-upgrade2/warehouse.pl
@@ -6,8 +6,6 @@ use strict;
 
 die("This script cannot be run from the command line.") unless ($main::form);
 
-# import vars from caller
-our ($dbup_locale, $dbup_myconfig, $dbh, $iconv);
 my $do_sql_migration = 0;
 my ($check_sql, $sqlcode);