cleaned up the code to remove comments with # and initialize variable…

… at line 506 properly with the value null and unwanted object creation
Luracast · Oct 14, 2011 · 4cd3439 · 4cd3439
1 parent 9746eb8
commit 4cd3439
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/restler/restler.php b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.2
+ * @version    2.0.3
  */
 class Restler {
-	const VERSION = '2.0.2';
+	const VERSION = '2.0.3';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -503,7 +503,7 @@ protected function getResponseFormat () {
 		/**
 		* @var iFormat
 		*/
-		$format;
+		$format=NULL;
 		$extension = explode('.', parse_url($_SERVER['REQUEST_URI'],
 		PHP_URL_PATH));
 		$extension = array_pop($extension);
@@ -529,7 +529,7 @@ protected function getResponseFormat () {
 		}
 		$format = $this->format_map['default'];
 		//echo "DEFAULT ".$this->format_map['default'];
-		return is_string($format) ? new $format: $format;
+		return $format;
 	}
 
 	/**
@@ -632,7 +632,7 @@ protected function loadCache()
 				$this->cached = TRUE;
 			}
 		} else {
-			#@unlink($this->cache_dir . "/$name.php");
+			//@unlink($this->cache_dir . "/$name.php");
 		}
 	}
 
@@ -663,7 +663,7 @@ protected function generateMap ($class_name, $base_path = "") {
 			(isRestlerCompatibilityModeEnabled() ? 2 :  3) :
 			(isset($metadata['protected']) ? 1 : 0);
 
-			#take note of the order
+			//take note of the order
 			$call = array(
 			'class_name'=>$class_name,
 			'method_name'=>$method->getName(),