Merge pull request #13 from bechtoldt/tag0927rc1

Tagging 0.9.27-rc1
froxlor · Mar 13, 2012 · 78dce12 · 78dce12
2 parents 1b22447 + 06f4f75
commit 78dce12
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/install/froxlor.sql b/install/froxlor.sql
@@ -469,7 +469,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.27-svn2');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.27-rc1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');

diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -1804,3 +1804,11 @@
 
 	updateToVersion('0.9.27-svn2');
 }
+
+if(isFroxlorVersion('0.9.27-svn2'))
+{
+	showUpdateStep("Updating from 0.9.27-svn2 to 0.9.27-rc1");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.27-rc1');
+}
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
@@ -73,6 +73,6 @@
 
 // VERSION INFO
 
-$version = '0.9.27-svn2';
+$version = '0.9.27-rc1';
 $dbversion = '2';
 $branding = '';