[FIX] Merge with development
This commit is contained in:
parent
d5af8ec8b2
commit
90181483b9
@ -2,7 +2,7 @@
|
|||||||
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
|
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
|
||||||
|
|
||||||
define('MPOS_VERSION', '0.0.4');
|
define('MPOS_VERSION', '0.0.4');
|
||||||
define('DB_VERSION', '0.0.9');
|
define('DB_VERSION', '0.0.10');
|
||||||
define('CONFIG_VERSION', '0.0.8');
|
define('CONFIG_VERSION', '0.0.8');
|
||||||
|
|
||||||
// Fetch installed database version
|
// Fetch installed database version
|
||||||
|
|||||||
@ -133,7 +133,7 @@ CREATE TABLE IF NOT EXISTS `settings` (
|
|||||||
UNIQUE KEY `setting` (`name`)
|
UNIQUE KEY `setting` (`name`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.9');
|
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.10');
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `shares` (
|
CREATE TABLE IF NOT EXISTS `shares` (
|
||||||
`id` bigint(30) NOT NULL AUTO_INCREMENT,
|
`id` bigint(30) NOT NULL AUTO_INCREMENT,
|
||||||
|
|||||||
@ -1,15 +1,15 @@
|
|||||||
<?php
|
<?php
|
||||||
function run_009() {
|
function run_0010() {
|
||||||
// Ugly but haven't found a better way
|
// Ugly but haven't found a better way
|
||||||
global $setting, $config, $statistics, $block, $mysqli;
|
global $setting, $config, $statistics, $block, $mysqli;
|
||||||
|
|
||||||
// Version information
|
// Version information
|
||||||
$db_version_old = '0.0.8'; // What version do we expect
|
$db_version_old = '0.0.9'; // What version do we expect
|
||||||
$db_version_new = '0.0.9'; // What is the new version we wish to upgrade to
|
$db_version_new = '0.0.10'; // What is the new version we wish to upgrade to
|
||||||
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
|
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
|
||||||
|
|
||||||
// Upgrade specific variables
|
// Upgrade specific variables
|
||||||
$aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.9' WHERE name = 'DB_VERSION'";
|
$aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.10' WHERE name = 'DB_VERSION'";
|
||||||
|
|
||||||
echo '- Starting configuration migration into new location' . PHP_EOL;
|
echo '- Starting configuration migration into new location' . PHP_EOL;
|
||||||
$files = glob(BASEPATH . '../public/include/config/*');
|
$files = glob(BASEPATH . '../public/include/config/*');
|
||||||
Loading…
Reference in New Issue
Block a user