Adding a quick check so locale_html doesn't get encoded (bug 375498). I'm leaving the bug open, because we need a more robust solution than this.

git-svn-id: http://svn.mozilla.org/addons/trunk@2987 4eb1ac78-321c-0410-a911-ec516a8615a5

1 files changed, 7 insertions, 1 deletions

diff --git a/site/app/app_controller.php b/site/app/app_controller.php
index 0f15508..2764cad 100644
--- a/site/app/app_controller.php
+++ b/site/app/app_controller.php
@@ -251,7 +251,13 @@ class AppController extends Controller
             if (empty($data)) return; // prevents removal of empty arrays
             // recurse through the array to get all values
             foreach ($data as $key => $value) {
-                $this->_sanitizeArray($data[$key]);
+                // @todo This if() statement is a temporary solution until we come up with
+                // a better way of excluding fields from being sanitized.  This
+                // particular array keeps the translations locale strings from
+                // becoming entities
+                if (!in_array($key,array('locale','locale_html'))) {
+                    $this->_sanitizeArray($data[$key]);
+                }
             }
             
             // change the keys if necessary