From c7ba318e017bc64ce2d7bc71398e0d5d01ade729 Mon Sep 17 00:00:00 2001
From: Pieter Frenssen <pieter@frenssen.be>
Date: Wed, 5 Dec 2012 15:51:42 +0100
Subject: [PATCH] Issue #1859150 by pfrenssen: Fixed strict warning in
 spaces_controller_boxes::load_original_values().

---
 plugins/spaces_controller_boxes.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/spaces_controller_boxes.inc b/plugins/spaces_controller_boxes.inc
index 8579709..68893d1 100644
--- a/plugins/spaces_controller_boxes.inc
+++ b/plugins/spaces_controller_boxes.inc
@@ -17,9 +17,9 @@ class spaces_controller_boxes extends spaces_controller {
         $this->values['original'] = $boxes;
         $this->loaded_all['original'] = TRUE;
       }
-      else if (!isset($this->loaded['original'][$id])) {
-        if ($box = array_pop(ctools_export_load_object('box', 'names', array($id)))) {
-          $this->values['original'][$id] = $box;
+      elseif (!isset($this->loaded['original'][$id])) {
+        if ($box = ctools_export_load_object('box', 'names', array($id))) {
+          $this->values['original'][$id] = reset($box);
           $this->loaded['original'][$id] = TRUE;
         }
       }
-- 
1.8.0