Updated Geeklog version to 2.2.1sr1

Geeklog-Core · Mar 15, 2020 · 46fa96c · 46fa96c
1 parent 78c42b2
commit 46fa96c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git 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
@@ -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
@@ -582,7 +582,7 @@ function update_DatabaseFor212()
 $display = '<h2>Development Database Update</h2>';
 
 $gl_prev_version = "2.2.1";
-$gl_devel_version = "2.2.2";
+$gl_devel_version = "2.2.1sr1";
 
 $display .= "<p>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.</p>
              <p>Update works for Geeklog $gl_prev_version up to latest Geeklog development version for $gl_devel_version.</p>";
@@ -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
@@ -100,5 +100,5 @@ if (!defined('LB')) {
 }
 
 if (!defined('VERSION')) {
-  define('VERSION', '2.2.2');
+  define('VERSION', '2.2.1sr1');
 }