Changeset 6110 for trunk/upgrade.php

Timestamp:

May 8, 2010, 1:08:51 AM (14 years ago)

Author:

patdenice

Message:

Upgrade can be launched automaticaly if user is already connected as webmaster.

File:

• trunk/upgrade.php (modified) (3 diffs)

trunk/upgrade.php

@@ -37 +37 @@
 }
 
-include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
-include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-
 include(PHPWG_ROOT_PATH.'local/config/database.inc.php');
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
@@ -49 +46 @@
 define('PREFIX_TABLE', $prefixeTable);
 define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db');
+
+include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
 // +-----------------------------------------------------------------------+
@@ -280 +280 @@
 $mysql_changes = array();
 
-if (isset($_POST['username']) and isset($_POST['password']))
-{
-  check_upgrade_access_rights($current_release, $_POST['username'], $_POST['password']);
-}
-
-if (isset($_POST['submit']) and check_upgrade())
+check_upgrade_access_rights();
+
+if ((isset($_POST['submit']) or isset($_GET['now']))
+  and check_upgrade())
 {
   $upgrade_file = PHPWG_ROOT_PATH.'install/upgrade_'.$current_release.'.php';