Damm forgot to pull before starting to edit....

Merge branch 'master' of https://github.com/WBCE/WebsiteBaker_CommunityEdition
WBCE · Aug 29, 2015 · 19f56e4 · 19f56e4
2 parents 852c57a + 85be132
commit 19f56e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/wbce/admin/interface/version.php b/wbce/admin/interface/version.php
@@ -16,12 +16,14 @@
 }
 
 // set WBCE version and release tag
+define('NEW_WBCE_VERSION', '1.0.0');
 if (!defined('WBCE_VERSION')) {
-    define('WBCE_VERSION', '1.0.0');
+    define('WBCE_VERSION', NEW_WBCE_VERSION);
 }
 
+define('NEW_WBCE_TAG', 'v1.0.0-Beta3');
 if (!defined('WBCE_TAG')) {
-    define('WBCE_TAG', 'v1.0.0-Beta3');
+    define('WBCE_TAG', NEW_WBCE_TAG);
 }
 
 // Legacy: WB-classic

diff --git a/wbce/upgrade-script.php b/wbce/upgrade-script.php
@@ -310,7 +310,7 @@ function status_msg($message, $class = 'check', $element = 'span')
 }
 
 // string for new version
-$newVersion = 'WBCE v' . WBCE_VERSION . ' (' . WBCE_TAG . ')';
+$newVersion = 'WBCE v' . NEW_WBCE_VERSION . ' (' . NEW_WBCE_TAG . ')';
 
 // set addition settings if not exists, otherwise upgrade will be breaks
 if (!defined('WB_SP')) {define('WB_SP', '');}
@@ -325,7 +325,7 @@ function status_msg($message, $class = 'check', $element = 'span')
  */
 if (!(isset($_POST['backup_confirmed']) && $_POST['backup_confirmed'] == 'confirmed')) {
     ?>
-<h2>Step 1: Backup your files</h2>
+<h2>Backup your files !!</h2>
 <p>It is highly recommended to <strong>create a manual backup</strong> of the entire <strong>/pages folder</strong> and the <strong>MySQL database</strong> before proceeding.<br /><strong class="error">Note: </strong>The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.</p>
 
 <form name="send" action="<?php echo $_SERVER['SCRIPT_NAME'];?>" method="post">
@@ -341,7 +341,7 @@ function status_msg($message, $class = 'check', $element = 'span')
     exit();
 }
 
-echo '<h2>Step ' . (++$stepID) . ' : Updating database entries</h2>';
+echo '<h2>Step ' . ($stepID++) . ' : Updating database entries</h2>';
 
 /**********************************************************
  *  - Adding field default_theme to settings table
@@ -513,7 +513,7 @@ function status_msg($message, $class = 'check', $element = 'span')
  * - check for deprecated / never needed files
  */
 if (sizeof($filesRemove)) {
-    echo '<h2>Step ' . (++$stepID) . ': Remove deprecated and old files</h2>';
+    echo '<h2>Step ' . ($stepID++) . ': Remove deprecated and old files</h2>';
 }
 $searches = array(
     '[ADMIN]',
@@ -565,7 +565,7 @@ function status_msg($message, $class = 'check', $element = 'span')
  * - check for deprecated / never needed files
  */
 if (sizeof($dirRemove)) {
-    echo '<h2>Step  ' . (++$stepID) . ': Remove deprecated and old folders</h2>';
+    echo '<h2>Step  ' . ($stepID++) . ': Remove deprecated and old folders</h2>';
     $searches = array(
         '[ADMIN]',
         '[MEDIA]',
@@ -613,7 +613,7 @@ function status_msg($message, $class = 'check', $element = 'span')
         $currModulVersion = get_modul_version($sModul, false);
         $newModulVersion = get_modul_version($sModul, true);
         if ((version_compare($currModulVersion, $newModulVersion) <= 0)) {
-            echo '<h2>Step ' . (++$stepID) . ' : Upgrade module \'' . $sModul . '\' to version ' . $newModulVersion . '</h2>';
+            echo '<h2>Step ' . ($stepID++) . ' : Upgrade module \'' . $sModul . '\' to version ' . $newModulVersion . '</h2>';
             require_once WB_PATH . '/modules/' . $sModul . '/upgrade.php';
         }
     }
@@ -622,7 +622,7 @@ function status_msg($message, $class = 'check', $element = 'span')
  *  - Reload all addons
  */
 
-echo '<h2>Step ' . (++$stepID) . ' : Reload all addons database entry (no upgrade)</h2>';
+echo '<h2>Step ' . ($stepID++) . ' : Reload all addons database entry (no upgrade)</h2>';
 ////delete modules
 //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'");
 // Load all modules
@@ -674,9 +674,9 @@ function status_msg($message, $class = 'check', $element = 'span')
 /**********************************************************
  *  - Set Version to new Version
  */
-echo '<br />Update database version number to ' . WBCE_VERSION . ' (Tag: ' . WBCE_TAG . ')';
-db_update_key_value('settings', 'wbce_version', WBCE_VERSION);
-db_update_key_value('settings', 'wbce_tag', WBCE_TAG);
+echo '<br />Update database version number to ' . NEW_WBCE_VERSION . ' (Tag: ' . NEW_WBCE_TAG . ')';
+db_update_key_value('settings', 'wbce_version', NEW_WBCE_VERSION);
+db_update_key_value('settings', 'wbce_tag', NEW_WBCE_TAG);
 db_update_key_value('settings', 'wb_version', VERSION);   // Legacy: WB-classic
 db_update_key_value('settings', 'wb_revision', REVISION); // Legacy: WB-classic
 db_update_key_value('settings', 'wb_sp', SP);             // Legacy: WB-classic