diff --git a/build.properties b/build.properties index 3eedb8a47..8385a4143 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # Property files contain key=value pairs # Geeklog version number -version=2.2.2 +version=2.2.1sr1 # Git hash tag for the previous version of Geeklog. e.g., "936264c" for Geeklog 2.1.3 previousVersionSHA=860e7e6 diff --git a/public_html/admin/install/classes/installer.class.php b/public_html/admin/install/classes/installer.class.php index 9a5eff739..ba3222d59 100644 --- a/public_html/admin/install/classes/installer.class.php +++ b/public_html/admin/install/classes/installer.class.php @@ -6,7 +6,7 @@ class Installer { // Geeklog version - const GL_VERSION = '2.2.2'; + const GL_VERSION = '2.2.1sr1'; // System requirements const SUPPORTED_PHP_VER = '5.6.4'; @@ -3072,19 +3072,7 @@ private function doDatabaseUpgrades($currentGlVersion, $checkForMessage = false) break; case '2.2.1': - /* - require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_2.2.1_to_2.2.2.php'; - if ($checkForMessage) { - $retval = upgrade_message221(); - if (is_array($retval)) { - $this->upgradeMessages = array_merge($this->upgradeMessages, $retval); - } - } else { - $this->updateDB($_SQL, $progress); - update_ConfValuesFor222(); - } - */ - $currentGlVersion = '2.2.2'; + $currentGlVersion = '2.2.1sr1'; break; default: diff --git a/public_html/admin/install/devel-db-update.php b/public_html/admin/install/devel-db-update.php index 13417f3d4..c55e3d3df 100644 --- a/public_html/admin/install/devel-db-update.php +++ b/public_html/admin/install/devel-db-update.php @@ -582,7 +582,7 @@ function update_DatabaseFor212() $display = '

Development Database Update

'; $gl_prev_version = "2.2.1"; -$gl_devel_version = "2.2.2"; +$gl_devel_version = "2.2.1sr1"; $display .= "

This update is for Geeklog Core and Core Plugins. Can include changes to database structure and data, along with configuration options. All Core plugins must be installed when you run this script.

Update works for Geeklog $gl_prev_version up to latest Geeklog development version for $gl_devel_version.

"; @@ -623,8 +623,8 @@ function update_DatabaseFor212() $new_plugin_version = false; switch ($pi_name) { case 'staticpages': - $new_plugin_version = false; - $plugin_version = '1.7.1'; // Current Geeklog v2.2.1 for plugin + $new_plugin_version = true; + $plugin_version = '1.7.2'; // Current Geeklog v2.2.1sr1 for plugin break; case 'spamx': $new_plugin_version = false; diff --git a/public_html/siteconfig.php.dist b/public_html/siteconfig.php.dist index 9fa2e4a14..c3949d5c1 100644 --- a/public_html/siteconfig.php.dist +++ b/public_html/siteconfig.php.dist @@ -100,5 +100,5 @@ if (!defined('LB')) { } if (!defined('VERSION')) { - define('VERSION', '2.2.2'); + define('VERSION', '2.2.1sr1'); }