r4206 make JSON test critical, update release notes and add missing 0.18.7 waypoint

diff --git a/README b/README
index 20791f9e93e9a81bd3f47420b0a91d3952f2c9c4..8f6f31cff1b59aaff4427732d303e2fd362348de 100644 (file)
--- a/README
+++ b/README
@@ -101,9 +101,6 @@ should be sufficient:
 *** Upgrading to 0.19.x ***
 
 RackTables is now using PHP JSON extension which is included in the PHP core since 5.2.0.
-Installation process does not check for this extension because the lack of it does not affect
-base functionality. If some of ajax features are not working correctly, check if JSON extension
-is availible in your installation of PHP.
 
 The barcode attribute was removed.  The upgrade script attempts to preserve the data by moving
 it to either the 'OEM S/N 1' attribute or to a Log entry.  You should backup your database

diff --git a/wwwroot/inc/config.php b/wwwroot/inc/config.php
index 55574c7e8ae702df941bceec12cd2cd070bd904a..2a7dd8f73fbf6221b62da31f4f3ac1e864fb2b09 100644 (file)
--- a/wwwroot/inc/config.php
+++ b/wwwroot/inc/config.php
@@ -23,6 +23,7 @@ $max_dict_key = array
        '0.18.4' => 1364,
        '0.18.5' => 1370,
        '0.18.6' => 1370,
+       '0.18.7' => 1370,
        '0.19.0' => 1559,
 );
 

diff --git a/wwwroot/inc/dictionary.php b/wwwroot/inc/dictionary.php
index 334023039eedaff41018cf191a6cc25b79f92942..e3811078e5540c8777fc4d5e64123f82ea5769ba 100644 (file)
--- a/wwwroot/inc/dictionary.php
+++ b/wwwroot/inc/dictionary.php
@@ -70,7 +70,7 @@ function platform_is_ok ()
        $nerrs += platform_function_test ('mb_strlen', 'Multibyte string extension');
        platform_function_test ('ldap_connect', 'LDAP extension', 'Not found, LDAP authentication will not work.', 'trwarning');
        platform_function_test ('pcntl_waitpid', 'PCNTL extension', '802.1Q parallel sync is unavailable.', 'trwarning');
-       platform_function_test ('json_encode', 'JSON extension', 'JavaScript interface bits may fail.', 'trwarning');
+       $nerrs += platform_function_test ('json_encode', 'JSON extension', 'JavaScript interface bits may fail.');
        platform_generic_test
        (
                (!empty($_SERVER['HTTPS']) and $_SERVER['HTTPS'] != 'off'),

diff --git a/wwwroot/upgrade.php b/wwwroot/upgrade.php
index ecb52553919f528632324b68064d78b6cac7eab5..7dc96d56444e9c963bc2bced86e77cdfe1c00cc0 100644 (file)
--- a/wwwroot/upgrade.php
+++ b/wwwroot/upgrade.php
@@ -35,6 +35,14 @@ in their default installation. There are yet options to work around that:
 3. Repair your RHEL/CentOS installation yourself by fixing its PCRE
 RPM as explained here: http://bugs.centos.org/view.php?id=3252
 ENDOFTEXT
+,
+       '0.19.0' => <<<ENDOFTEXT
+RackTables is now using PHP JSON extension which is included in the PHP core since 5.2.0.
+
+The barcode attribute was removed.  The upgrade script attempts to preserve the data by moving
+it to either the 'OEM S/N 1' attribute or to a Log entry.  You should backup your database
+beforehand anyway.
+ENDOFTEXT
 ,
 );
 
@@ -71,6 +79,7 @@ function getDBUpgradePath ($v1, $v2)
                '0.18.4',
                '0.18.5',
                '0.18.6',
+               '0.18.7',
                '0.19.0',
        );
        if (!in_array ($v1, $versionhistory) or !in_array ($v2, $versionhistory))
@@ -760,6 +769,10 @@ CREATE TABLE `VLANValidID` (
                        $query = array_merge ($query, reloadDictionary ($batchid));
                        $query[] = "UPDATE Config SET varvalue = '0.18.6' WHERE varname = 'DB_VERSION'";
                        break;
+               case '0.18.7':
+                       $query = array_merge ($query, reloadDictionary ($batchid));
+                       $query[] = "UPDATE Config SET varvalue = '0.18.7' WHERE varname = 'DB_VERSION'";
+                       break;
                case '0.19.0':
                        $query = array_merge ($query, reloadDictionary ($batchid));
                        $query[] = 'ALTER TABLE `File` ADD `thumbnail` LONGBLOB NULL AFTER `atime`';