Changeset 870 for trunk/upgrade.php

Timestamp:

Sep 21, 2005, 12:04:57 AM (19 years ago)

Author:

plg

Message:

• update: upgrade from 1.4.0 or 1.4.1. Upgrade from 1.3.x is not available anymore.

• update: README files updated for very near branch 1.5 :-)

• new: file tools/config_local.inc.php as example for optional include/config_local.inc.php

• bug fixed: configuration parameter show_picture_name_on_title was useless

File:

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

trunk/upgrade.php

@@ -26 +26 @@
 // +-----------------------------------------------------------------------+
 
-define('IN_UPGRADE', true);
 define('PHPWG_ROOT_PATH', './');
 
@@ -35 +34 @@
 include(PHPWG_ROOT_PATH.'include/mysql.inc.php');
 // Is PhpWebGallery already installed ?
-if (defined('PHPWG_INSTALLED'))
-{
-  $message = 'PhpWebGallery is already installed. In include/mysql.inc.php,
-remove line
+if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
+{
+  $message = 'PhpWebGallery is not in upgrade mode. In include/mysql.inc.php,
+insert line
 <pre style="background-color:lightgray">
-define(\'PHPWG_INSTALLED\', true);
+define(\'PHPWG_IN_UPGRADE\', true);
 </pre>
 if you want to upgrade';
   die($message);
 }
+
+// concerning upgrade, we use the default users table
+$conf['users_table'] = $prefixeTable.'users';
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
@@ -114 +116 @@
 // |                        template initialization                        |
 // +-----------------------------------------------------------------------+
-$template = setup_style('default');
+
+$template = new Template(PHPWG_ROOT_PATH.'template/yoga');
 $template->set_filenames(array('upgrade'=>'upgrade.tpl'));
 $template->assign_vars(array('RELEASE'=>PHPWG_VERSION));
+
 // +-----------------------------------------------------------------------+
 // |                          versions upgradable                          |
@@ -179 +183 @@
       $infos,
       '[security] delete files "upgrade.php", "install.php" and "install"
-directory');
+directory'
+      );
+
+    array_push(
+      $infos,
+      'in include/mysql.inc.php, remove
+<pre style="background-color:lightgray">
+define(\'PHPWG_IN_UPGRADE\', true);
+</pre>'
+      );
     
     $template->assign_block_vars('upgrade.infos', array());