diff options
| author | lthomson@mozilla.com <lthomson@mozilla.com@4eb1ac78-321c-0410-a911-ec516a8615a5> | 2008-03-18 15:12:50 (GMT) |
|---|---|---|
| committer | lthomson@mozilla.com <lthomson@mozilla.com@4eb1ac78-321c-0410-a911-ec516a8615a5> | 2008-03-18 15:12:50 (GMT) |
| commit | 1e41d93f3369758eff7d84d7d23fd75cb53f334d (patch) | |
| tree | 656e7604d1ecf668c90f60f20f2c6c192e69ac8f /site/app/controllers/developers_controller.php | |
| parent | eec36ef4068d4c968e96939134b9efa41b344d7f (diff) | |
Get this array_merge fix into trunk, refs #414763
git-svn-id: http://svn.mozilla.org/addons/trunk@11357 4eb1ac78-321c-0410-a911-ec516a8615a5
Diffstat (limited to 'site/app/controllers/developers_controller.php')
| -rw-r--r-- | site/app/controllers/developers_controller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php index f4f9ccc..049ad29 100644 --- a/site/app/controllers/developers_controller.php +++ b/site/app/controllers/developers_controller.php @@ -497,7 +497,7 @@ class DevelopersController extends AppController } //If creating new, blacklist status and id. - $addonData = @array_merge($this->data['Addon'], $this->addVars['file4']); + $addonData = array_merge($this->data['Addon'], (array)$this->addVars['file4']); $addonData = $this->Amo->filterFields($addonData, array(), array('status', 'id', 'trusted', 'averagerating', 'weeklydownloads', 'totaldownloads')); $this->Addon->save($addonData); @@ -515,7 +515,7 @@ class DevelopersController extends AppController } else { //If updating, whitelist defaultlocale and icon fields - $addonData = @array_merge($this->data['Addon'], $this->addVars['file4']); + $addonData = array_merge($this->data['Addon'], (array)$this->addVars['file4']); $addonData = $this->Amo->filterFields($addonData, array('defaultlocale', 'icondata', 'icontype')); $this->Addon->save($addonData); |