[Web-erp-svn] SF.net SVN: web-erp:[7800] trunk

[<ex...@us...>]

Revision: 7800
          http://sourceforge.net/p/web-erp/reponame/7800
Author:   exsonqu
Date:     2017-06-26 05:03:16 +0000 (Mon, 26 Jun 2017)
Log Message:
-----------
26/06/17 Exson: Fix the bug of cannot upgrade to 4.14 version.

Modified Paths:
--------------
    trunk/UpgradeDatabase.php
    trunk/includes/GetConfig.php
    trunk/sql/mysql/upgrade4.13.1-4.14.sql

Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php	2017-06-26 04:53:33 UTC (rev 7799)
+++ trunk/UpgradeDatabase.php	2017-06-26 05:03:16 UTC (rev 7800)
@@ -196,7 +196,7 @@
 					$SQLScripts[] = './sql/mysql/upgrade4.12.3-4.13.sql';
 				case '4.13':
 					$SQLScripts[] = './sql/mysql/upgrade4.13-4.13.1.sql';
-				case '4.14':
+				case '4.13.1':
 					$SQLScripts[] = './sql/mysql/upgrade4.13.1-4.14.sql';
 
 					break;

Modified: trunk/includes/GetConfig.php
===================================================================
--- trunk/includes/GetConfig.php	2017-06-26 04:53:33 UTC (rev 7799)
+++ trunk/includes/GetConfig.php	2017-06-26 05:03:16 UTC (rev 7800)
@@ -120,14 +120,6 @@
 
 	$sql = "SELECT href, caption FROM favourites WHERE userid='" . $_SESSION['UserID'] . "'";
 	$result = DB_query($sql,'','',false,false);
-	if (DB_error_no()!=0) {
-		$result = DB_query("CREATE table favourites (userid varchar(20) NOT NULL DEFAULT '',
-											caption varchar(50) NOT NULL DEFAULT '',
-											href varchar(200) NOT NULL DEFAULT '#',
-											PRIMARY KEY (userid,caption))
-							Engine=InnoDB DEFAULT CHARSET=utf8");
-		$result = DB_query($sql);
-	}
 	if (DB_num_rows($result)>0) {
 		while ($myrow = DB_fetch_array($result)) {
 			$_SESSION['Favourites'][$myrow['href']] = $myrow['caption'];

Modified: trunk/sql/mysql/upgrade4.13.1-4.14.sql
===================================================================
--- trunk/sql/mysql/upgrade4.13.1-4.14.sql	2017-06-26 04:53:33 UTC (rev 7799)
+++ trunk/sql/mysql/upgrade4.13.1-4.14.sql	2017-06-26 05:03:16 UTC (rev 7800)
@@ -13,6 +13,10 @@
 INSERT INTO `scripts` (`script`, `pagesecurity`, `description`) VALUES ('PcReportExpense.php', '15', '');
 -- Convert prices to use non- SQL mode specific end date we will have a year 10000 problem but its a way off!:
 UPDATE prices SET enddate='9999-12-31' WHERE enddate='0000-00-00';
+CREATE table favourites (userid varchar(20) NOT NULL DEFAULT '',
+	caption varchar(50) NOT NULL DEFAULT '',
+	href varchar(200) NOT NULL DEFAULT '#',
+	PRIMARY KEY (userid,caption)) Engine=InnoDB DEFAULT CHARSET=utf8;
 
 -- Update version number:
 UPDATE config SET confvalue='4.14' WHERE confname='VersionNumber';