r2823 - upgrade.php: replace showError() calls with showFailure() to make changeset...

diff --git a/ChangeLog b/ChangeLog
index b18f7fdf8ccdf0437791a1956e0e6dfb7d2f65cf..7c85d195bc1371906d87ea48d4eefb6cb424c2bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        bugfix: string value "0" was incorrectly handled, when displaying or entering data
        bugfix: rackspace allocation history recording did not work in 0.17.0
        bugfix: boolean expressions parsing in RackCode now honours priorities
+       bugfix: upgrade script could fail sometimes
        update: removed unused database index
 0.17.0 2009-05-20
        new feature: file attachments (by Aaron)

diff --git a/upgrade.php b/upgrade.php
index 74290aec359ae75ddc4cfd00f40ea93a3679c49d..ca35d50af55c61028b21c4e0b05676031603cf5e 100644 (file)
--- a/upgrade.php
+++ b/upgrade.php
@@ -360,7 +360,7 @@ switch ($user_auth_src)
                {
                        header ('WWW-Authenticate: Basic realm="RackTables upgrade"');
                        header ('HTTP/1.0 401 Unauthorized');
-                       showError ('You must be authenticated as an administrator to complete the upgrade.', __FILE__);
+                       showFailure ('You must be authenticated as an administrator to complete the upgrade.', __FILE__);
                        die;
                }
                break; // cleared
@@ -371,12 +371,12 @@ switch ($user_auth_src)
                        !strlen ($_SERVER['REMOTE_USER'])
                )
                {
-                       showError ('System misconfiguration. The web-server didn\'t authenticate the user, although ought to do.');
+                       showFailure ('System misconfiguration. The web-server didn\'t authenticate the user, although ought to do.');
                        die;
                }
                break; // cleared
        default:
-               showError ('authentication source misconfiguration', __FILE__);
+               showFailure ('authentication source misconfiguration', __FILE__);
                die;
 }