Merge pull request #2534 from Alex-Code/pjax

framework/widgets/Pjax.php

@@ -102,18 +102,18 @@ class Pjax extends Widget
 			if ($view->title !== null) {
 				echo Html::tag('title', Html::encode($view->title));
 			}
-		}
+		} else {
 			echo Html::beginTag('div', $this->options);
 		}
+	}
 
 	/**
 	 * @inheritdoc
 	 */
 	public function run()
 	{
-		echo Html::endTag('div');
-
 		if (!$this->requiresPjax()) {
+			echo Html::endTag('div');
 			$this->registerClientScript();
 			return;
 		}
@@ -152,7 +152,7 @@ class Pjax extends Widget
 	protected function requiresPjax()
 	{
 		$headers = Yii::$app->getRequest()->getHeaders();
-		return $headers->get('X-Pjax') && ($selector = $headers->get('X-Pjax-Container')) === '#' . $this->getId();
+		return $headers->get('X-Pjax') && $headers->get('X-Pjax-Container') === '#' . $this->getId();
 	}
 
 	/**