Fix issue with deploy mapping.

Missed a portion of the array storing/altering that caused deploy not to merge in properly.
FOGProject · Jan 2, 2017 · 2f83461 · 2f83461
1 parent 3fb6ae0
commit 2f83461
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/web/lib/fog/fogbase.class.php b/packages/web/lib/fog/fogbase.class.php
@@ -2236,10 +2236,11 @@ public static function fastmerge($array1)
                 if (is_numeric($key)) {
                     $array1[] = $oth;
                     continue;
+                } else {
+                    $array1[$key] = $oth;
                 }
                 unset($oth);
             }
-            $array1 += $other;
             unset($other);
         }
 

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.3.1-RC-1');
+        define('FOG_VERSION', '2');
         define('FOG_SCHEMA', 244);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-02 15:06-0500\n"
+"POT-Creation-Date: 2017-01-02 15:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"