oops, messed up the is_open_and_located stuff

hicapacity · Jul 9, 2011 · 410b7b1 · 410b7b1
1 parent 5c0696d
commit 410b7b1
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/protected/models/Trucks.php b/protected/models/Trucks.php
@@ -146,7 +146,7 @@ public static function get_all_located_trucks(){
 	 */
 	public static function get_all_open_and_located_trucks(){
 		$trucks = Trucks::get_all_located_trucks();
-		$ret = array_filter($trucks, array('Trucks', 'is_open_and_located'));
+		$ret = array_filter($trucks, array('Trucks', 'is_open'));
 		// because M**F** PHP doesn't have a decent list type
 		return array_values($ret);
 	}
@@ -183,10 +183,6 @@ public static function is_open($truck){
 	  return ($now >= $tweet_starttime->getTimestamp()) && ($tweet_endtime->getTimestamp() >= $now);
 	}
 
-	public static function is_open_and_located($truck){
-		return Trucks::is_open($truck) && Trucks::has_geo($truck);
-	}
-
 	public static function obj_to_array($truck){
 		$ret = Array(
 			"id" => $truck->id,