Updated Geeklog version to 2.2.2

Geeklog-Core · Mar 5, 2020 · 6deaafd · 6deaafd
1 parent 17907b5
commit 6deaafd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 19 deletions.
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.1';
+    const GL_VERSION = '2.2.2';
 
     // System requirements
     const SUPPORTED_PHP_VER = '5.6.4';
@@ -3071,6 +3071,22 @@ private function doDatabaseUpgrades($currentGlVersion, $checkForMessage = false)
                     $currentGlVersion = '2.2.1';
                     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';
+                    break;
+
                 default:
                     $done = true;
                     break;

diff --git a/public_html/admin/install/devel-db-update.php b/public_html/admin/install/devel-db-update.php
@@ -581,8 +581,8 @@ function update_DatabaseFor212()
 
 $display = '<h2>Development Database Update</h2>';
 
-$gl_prev_version = "2.2.0";
-$gl_devel_version = "2.2.1";
+$gl_prev_version = "2.2.1";
+$gl_devel_version = "2.2.2";
 
 $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>";
@@ -601,7 +601,7 @@ function update_DatabaseFor212()
 $short_version = str_replace(".","", $gl_devel_version);
 $function = 'update_ConfValuesFor' . $short_version;
 if (function_exists($function)) {
-    if ($function()) {;
+    if ($function()) {
         $display .= 'Configuration settings updated successfully.';
     } else {
         $display .= 'There was problems updating the configuration settings.';
@@ -623,32 +623,32 @@ function update_DatabaseFor212()
     $new_plugin_version = false;
     switch ($pi_name) {
         case 'staticpages':
-            $new_plugin_version = true;
-            $plugin_version = '1.7.1';
+            $new_plugin_version = false;
+            $plugin_version = '1.7.1'; // Current Geeklog v2.2.1 for plugin
             break;
         case 'spamx':
-            $new_plugin_version = true;
-            $plugin_version = '1.3.6';
+            $new_plugin_version = false;
+            $plugin_version = '1.3.6'; // Current Geeklog v2.2.1 for plugin
             break;
         case 'links':
-            $new_plugin_version = true;
-            $plugin_version = '2.1.7';
+            $new_plugin_version = false;
+            $plugin_version = '2.1.7'; // Current Geeklog v2.2.1 for plugin
             break;
         case 'polls':
-            $new_plugin_version = true;
-            $plugin_version = '2.2.0';
+            $new_plugin_version = false;
+            $plugin_version = '2.2.0'; // Current Geeklog v2.2.1 for plugin
             break;
         case 'calendar':
-            $new_plugin_version = true;
-            $plugin_version = '1.1.8';
+            $new_plugin_version = false;
+            $plugin_version = '1.1.8'; // Current Geeklog v2.2.1 for plugin
             break;
         case 'xmlsitemap':
-            $new_plugin_version = true;
-            $plugin_version = '2.0.2';
+            $new_plugin_version = false;
+            $plugin_version = '2.0.2'; // Current Geeklog v2.2.1 for plugin
             break;
         case 'recaptcha':
-            $new_plugin_version = true;
-            $plugin_version = '1.2.1';
+            $new_plugin_version = false;
+            $plugin_version = '1.2.1'; // Current Geeklog v2.2.1 for plugin
             break;
     }
 

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.1');
+  define('VERSION', '2.2.2');
 }