Fixed issue when using multiple extensions in Router::parseExtensions…

…() could result in undefined index notice by RequestHandlerComponent.
cakephp · Oct 19, 2011 · 646b8f1 · 646b8f1
1 parent fb4a003
commit 646b8f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -140,7 +140,7 @@ protected function _setExtension() {
 		$preferredTypes = $this->mapType($preferred);
 		$similarTypes = array_intersect($extensions, $preferredTypes);
 		if (count($similarTypes) === 1 && !in_array('html', $preferredTypes)) {
-			$this->ext = $similarTypes[0];
+			$this->ext = array_shift($similarTypes);
 		}
 	}
 

diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -193,6 +193,21 @@ public function testInitializeContentTypeWithjQueryAccept() {
 		$this->assertEquals('json', $this->RequestHandler->ext);
 	}
 
+/**
+ * Test that RequestHandler sets $this->ext when jQuery sends its wonky-ish headers
+ * and the application is configured to handle multiplate extensions
+ *
+ * @return void
+ */
+	public function testInitializeContentTypeWithjQueryAcceptAndMultiplesExtensions() {
+		$_SERVER['HTTP_ACCEPT'] = 'application/json, text/javascript, */*; q=0.01';
+		$this->assertNull($this->RequestHandler->ext);
+		Router::parseExtensions('rss', 'json');
+
+		$this->RequestHandler->initialize($this->Controller);
+		$this->assertEquals('json', $this->RequestHandler->ext);
+	}
+
 /**
  * Test that RequestHandler does not set $this->ext when multple accepts are sent.
  *