diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fdb33747..10c92df7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,12 @@ Changelog Not yet released ---------------- +v3.4.2 (released September 24, 2019) +-------------------------------- + +* : Fixed wrong upgrade query and added forgotten version_compare. + + v3.4.1 (released September 17, 2019) -------------------------------- diff --git a/README.rst b/README.rst index 0cdc7729..fef26c7f 100755 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ PHP Server Monitor :alt: Join the chat at https://gitter.im/erickrf/nlpnet :target: https://gitter.im/phpservermon/phpservermon -Version 3.4.1 (Updated design!) +Version 3.4.2 (Updated design!) PHP Server Monitor is a script that checks whether your websites and servers are up and running. diff --git a/docs/conf.py b/docs/conf.py index 0a95ccd2..f79541f8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,7 +51,7 @@ copyright = u'2008-2017, Pepijn Over' # built documents. # # The short X.Y version. -version = '3.4.1' +version = '3.4.2' # The full version, including alpha/beta/rc tags. release = version diff --git a/src/includes/psmconfig.inc.php b/src/includes/psmconfig.inc.php index a5644657..e20df145 100644 --- a/src/includes/psmconfig.inc.php +++ b/src/includes/psmconfig.inc.php @@ -29,7 +29,7 @@ /** * Current PSM version */ -define('PSM_VERSION', '3.4.1'); +define('PSM_VERSION', '3.4.2'); /** * URL to check for updates. Will not be checked if turned off on config page. diff --git a/src/psm/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php index 002a004f..633b8b99 100644 --- a/src/psm/Util/Install/Installer.php +++ b/src/psm/Util/Install/Installer.php @@ -322,6 +322,9 @@ class Installer { if (version_compare($version_from, '3.4.0', '<')) { $this->upgrade340(); } + if (version_compare($version_from, '3.4.2', '<')) { + $this->upgrade342(); + } psm_update_conf('version', $version_to); } @@ -573,17 +576,15 @@ class Installer { $this->execSQL($queries); $this->log('Combined notifications enabled. Check out the config page for more info.'); } + /** - * Patch for v3.4.1 release + * Patch for v3.4.2 release + * Version_compare was forgotten in v3.4.1 and query failed. + * Fixed in v3.4.2, 3.4.1 has been removed. */ - protected function upgrade341() { + protected function upgrade342() { $queries = array(); - /** - * Redirect_check is first set to default ok. - * If you have a lot of server that are redirecting, - * this will make sure you're servers stay online. - */ - $queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ALTER COLUMN `last_output` text;"; + $queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` CHANGE `last_output` `last_output` TEXT;"; $this->execSQL($queries); } }