update to 7.x-3.6

Signed-off-by: bachy <git@g-u-i.net>
2013-03-29 17:18:33 +01:00
parent 184a808558
commit 578adab53b
21 changed files with 149 additions and 44 deletions
@@ -346,8 +346,8 @@ class views_object {
      $value = $options;
      // Build source data and add to the array
      $format = NULL;
-      if (isset($definition['format_key']) && isset($options[$definition['format_key']])) {
-        $format = $options[$definition['format_key']];
+      if (isset($definition['format_key']) && isset($storage[$definition['format_key']])) {
+        $format = $storage[$definition['format_key']];
      }
      $translatable[] = array(
        'value' => $value,