From 3b42f0e84dec4f40f7962bad16905867fb1f8d66 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:00:58 -0400
Subject: [PATCH] - added execution of dev_collection sql file

---
 install/lib/update.lib.php |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index f81ed45..d2d11bf 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -160,13 +160,15 @@
 
 		//* get the version of the db schema from the server table
 		$found = true;
+		$dev_patch = false;
 		while($found == true) {
-			$next_db_version = intval($current_db_version + 1);
+			if($dev_patch == true) $next_db_version = 'dev_collection';
+			else $next_db_version = intval($current_db_version + 1);
 			$sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
 			$php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
 			
 			// comma separated list of version numbers were a update has to be done silently
-			$silent_update_versions = '75';
+			$silent_update_versions = 'dev_collection,75';
 
 			if(is_file($sql_patch_filename)) {
 
@@ -204,8 +206,12 @@
 					$php_patch->onAfterSQL();
 				}
 
-				$current_db_version = $next_db_version;
+				if($dev_patch == false) $current_db_version = $next_db_version;
+				else $found = false;
+				
 				if(isset($php_patch)) unset($php_patch);
+			} elseif($dev_patch == false) {
+				$dev_patch = true;
 			} else {
 				$found = false;
 			}

--
Gitblit v1.9.1