Browse Source

PHP 5.4 strict error fix

dogmatic69 13 years ago
parent
commit
173524ade2
1 changed files with 4 additions and 2 deletions
  1. 4 2
      lib/Cake/Utility/ObjectCollection.php

+ 4 - 2
lib/Cake/Utility/ObjectCollection.php

@@ -299,7 +299,8 @@ abstract class ObjectCollection {
  */
 	public function set($name = null, $object = null) {
 		if (!empty($name) && !empty($object)) {
-			$this->_loaded[array_pop(pluginSplit($name))] = $object;
+			list(, $name) = pluginSplit($name);
+			$this->_loaded[$name] = $object;
 		}
 		return $this->_loaded;
 	}
@@ -319,7 +320,8 @@ abstract class ObjectCollection {
 				$options = (array)$objectName;
 				$objectName = $i;
 			}
-			$normal[array_pop(pluginSplit($objectName))] = array('class' => $objectName, 'settings' => $options);
+			list(, $name) = pluginSplit($objectName);
+			$normal[$name] = array('class' => $objectName, 'settings' => $options);
 		}
 		return $normal;
 	}