From 90181483b9815f0871eb17d34a47421606f1b320 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 24 Apr 2014 11:43:00 +0200
Subject: [PATCH] [FIX] Merge with development

---
 include/version.inc.php                                   | 2 +-
 sql/000_base_structure.sql                                | 2 +-
 .../{0.0.8_to_0.0.9.inc.php => 0.0.9_to_0.0.10.inc.php}   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename upgrade/definitions/{0.0.8_to_0.0.9.inc.php => 0.0.9_to_0.0.10.inc.php} (89%)

diff --git a/include/version.inc.php b/include/version.inc.php
index c9316aab..8e9e234c 100644
--- a/include/version.inc.php
+++ b/include/version.inc.php
@@ -2,7 +2,7 @@
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
 define('MPOS_VERSION', '0.0.4');
-define('DB_VERSION', '0.0.9');
+define('DB_VERSION', '0.0.10');
 define('CONFIG_VERSION', '0.0.8');
 
 // Fetch installed database version
diff --git a/sql/000_base_structure.sql b/sql/000_base_structure.sql
index 18160aac..6fa9b4a1 100644
--- a/sql/000_base_structure.sql
+++ b/sql/000_base_structure.sql
@@ -133,7 +133,7 @@ CREATE TABLE IF NOT EXISTS `settings` (
   UNIQUE KEY `setting` (`name`)
 ) 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` (
   `id` bigint(30) NOT NULL AUTO_INCREMENT,
diff --git a/upgrade/definitions/0.0.8_to_0.0.9.inc.php b/upgrade/definitions/0.0.9_to_0.0.10.inc.php
similarity index 89%
rename from upgrade/definitions/0.0.8_to_0.0.9.inc.php
rename to upgrade/definitions/0.0.9_to_0.0.10.inc.php
index c4d0add2..c39aad61 100755
--- a/upgrade/definitions/0.0.8_to_0.0.9.inc.php
+++ b/upgrade/definitions/0.0.9_to_0.0.10.inc.php
@@ -1,15 +1,15 @@
 <?php
-function run_009() {
+function run_0010() {
   // Ugly but haven't found a better way
   global $setting, $config, $statistics, $block, $mysqli;
 
   // Version information
-  $db_version_old = '0.0.8';  // What version do we expect
-  $db_version_new = '0.0.9';  // What is the new version we wish to upgrade to
+  $db_version_old = '0.0.9';  // What version do we expect
+  $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
 
   // 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;
   $files = glob(BASEPATH . '../public/include/config/*');