r4264 fix bits specific to 0.19.2

diff --git a/ChangeLog b/ChangeLog
index dbccaf61e3b6b99cc1530c9a82800866bc9a0f34..ac01626c2e1b91248fbfc26544aca35449eb3f2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
        bugfix: port linking was broken for some users due to open PDO cursor
        bugfix: Permissions code editor was broken with Google Chrome
        update: new DB table indexes speeding up IP tree operations
+       update: tolerate user-visible newlines in secret.php and local.php
 0.19.1 2011-02-22
        update: UI: rack lists are now reduced by common tags with object on Rackspace tab (FILTER_RACKLIST_BY_TAGS config var)
        update: 802.1q: If switch has IP interface in some VLAN linked to IP subnet, this VLAN is not pruned from switch's uplink

diff --git a/wwwroot/inc/config.php b/wwwroot/inc/config.php
index c1a0c351b3f8e0a862904a83b9c1e2e9625b4db8..64b98808da2a02ce15d60cc778cb6b6af7e695aa 100644 (file)
--- a/wwwroot/inc/config.php
+++ b/wwwroot/inc/config.php
@@ -39,6 +39,7 @@ $max_dict_key = array
        '0.18.7' => 1370,
        '0.19.0' => 1559,
        '0.19.1' => 1559,
+       '0.19.2' => 1559,
 );
 
 ?>

diff --git a/wwwroot/upgrade.php b/wwwroot/upgrade.php
index 4e89480d522490a1edf27c20194a14603b3978cb..6c99a17ed4ccabc32c8f06e4a8b72cdf5fd00a98 100644 (file)
--- a/wwwroot/upgrade.php
+++ b/wwwroot/upgrade.php
@@ -105,6 +105,7 @@ function getDBUpgradePath ($v1, $v2)
                '0.18.7',
                '0.19.0',
                '0.19.1',
+               '0.19.2',
        );
        if (!in_array ($v1, $versionhistory) or !in_array ($v2, $versionhistory))
                return NULL;
@@ -1006,7 +1007,7 @@ CREATE TABLE `EntityLink` (
                        $query[] = "ALTER TABLE IPv6Allocation ADD KEY `ip` (`ip`)";
                        $query[] = "ALTER TABLE IPv4VS ADD KEY `vip` (`vip`)";
                        $query[] = "ALTER TABLE IPv4RS ADD KEY `rsip` (`rsip`)";
-                       $query[] = "UPDATE Config SET varvalue = '0.19.1' WHERE varname = 'DB_VERSION'";
+                       $query[] = "UPDATE Config SET varvalue = '0.19.2' WHERE varname = 'DB_VERSION'";
                        break;
                default:
                        showError ("executeUpgradeBatch () failed, because batch '${batchid}' isn't defined");