From 293cb9d86f0f62f71a6943075d9a2985e09af655 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 4 Oct 2013 20:35:58 -0400
Subject: [PATCH] Fixed search form.

---
 framework/yii/gii/generators/crud/templates/views/_search.php | 5 ++++-
 framework/yii/grid/DataColumn.php                             | 2 +-
 framework/yii/helpers/BaseHtml.php                            | 2 +-
 framework/yii/web/Request.php                                 | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/framework/yii/gii/generators/crud/templates/views/_search.php b/framework/yii/gii/generators/crud/templates/views/_search.php
index a649589..13e2b82 100644
--- a/framework/yii/gii/generators/crud/templates/views/_search.php
+++ b/framework/yii/gii/generators/crud/templates/views/_search.php
@@ -23,7 +23,10 @@ use yii\widgets\ActiveForm;
 
 <div class="<?php echo Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-search">
 
-	<?php echo '<?php'; ?> $form = ActiveForm::begin(array('method' => 'get')); ?>
+	<?php echo '<?php'; ?> $form = ActiveForm::begin(array(
+		'action' => array('index'),
+		'method' => 'get',
+	)); ?>
 
 <?php
 $count = 0;
diff --git a/framework/yii/grid/DataColumn.php b/framework/yii/grid/DataColumn.php
index 4ebbb8f..9e0ec79 100644
--- a/framework/yii/grid/DataColumn.php
+++ b/framework/yii/grid/DataColumn.php
@@ -73,7 +73,7 @@ class DataColumn extends Column
 	 * the [[filter]] property. When [[filter]] is not set or is an array, this property will be used to
 	 * render the HTML attributes for the generated filter input fields.
 	 */
-	public $filterInputOptions = array('class' => 'form-control');
+	public $filterInputOptions = array('class' => 'form-control', 'id' => null);
 
 
 	protected function renderHeaderCellContent()
diff --git a/framework/yii/helpers/BaseHtml.php b/framework/yii/helpers/BaseHtml.php
index 2baa679..ff12cd5 100644
--- a/framework/yii/helpers/BaseHtml.php
+++ b/framework/yii/helpers/BaseHtml.php
@@ -237,7 +237,7 @@ class BaseHtml
 				$hiddenInputs[] = static::hiddenInput($request->restVar, $method);
 				$method = 'post';
 			}
-			if ($request->enableCsrfValidation) {
+			if ($request->enableCsrfValidation && !strcasecmp($method, 'post')) {
 				$hiddenInputs[] = static::hiddenInput($request->csrfVar, $request->getCsrfToken());
 			}
 		}
diff --git a/framework/yii/web/Request.php b/framework/yii/web/Request.php
index e5d9477..312adc1 100644
--- a/framework/yii/web/Request.php
+++ b/framework/yii/web/Request.php
@@ -77,6 +77,7 @@ class Request extends \yii\base\Request
 	 */
 	const CSRF_HEADER = 'X-CSRF-Token';
 
+
 	/**
 	 * @var boolean whether to enable CSRF (Cross-Site Request Forgery) validation. Defaults to true.
 	 * When CSRF validation is enabled, forms submitted to an Yii Web application must be originated