Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Revert "Modifying Collection and Entity so that you can pass in $opti…

…ons if you so desire. This allows you to"

This reverts commit 348231d.
  • Loading branch information...
commit 8f3f9773458e474e68a27ad32340d1d393e91e89 1 parent 586fd74
John Coggeshall authored
9  data/Collection.php
@@ -492,13 +492,8 @@ public function sort($field = 'id', array $options = array()) {
492 492
 	 *
493 493
 	 * @return array Returns the array value of the data in this `Collection`.
494 494
 	 */
495  
-	public function data(array $options = array()) {
496  
-		$defaults = array(
497  
-			'indexed' => null		
498  
-		);
499  
-		
500  
-		$options += $defaults;
501  
-		return $this->to('array', $options);
  495
+	public function data() {
  496
+		return $this->to('array', array('indexed' => null));
502 497
 	}
503 498
 
504 499
 	/**
4  data/Entity.php
@@ -218,11 +218,11 @@ public function set(array $data) {
218 218
 	 * @param string $name Optionally included field name.
219 219
 	 * @return mixed Entire data array if $name is empty, otherwise the value from the named field.
220 220
 	 */
221  
-	public function data($name = null, array $options = array()) {
  221
+	public function data($name = null) {
222 222
 		if ($name) {
223 223
 			return $this->__get($name);
224 224
 		}
225  
-		return $this->to('array', $options);
  225
+		return $this->to('array');
226 226
 	}
227 227
 
228 228
 	/**

0 notes on commit 8f3f977

Please sign in to comment.
Something went wrong with that request. Please try again.