php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed typo

Browse Source 
fixes #5339
This commit is contained in:
Carsten Brandt
2014-10-03 17:47:08 +02:00
parent 9d81395a6d
commit f85f339356
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guide/intro-upgrade-from-v1.md
View File

@ -209,7 +209,7 @@ To learn more details about models, please refer to the [Models](structure-model
Controllers Controllers
----------- -----------
Yii 2.0 uses [[yii\web\Controller]] as the base controller class, similar to `CWebController` in Yii 1.1. Yii 2.0 uses [[yii\web\Controller]] as the base controller class, which is similar to `CController` in Yii 1.1.
[[yii\base\Action]] is the base class for action classes. [[yii\base\Action]] is the base class for action classes.
The most obvious impact of these changes on your code is that a controller action should return the content The most obvious impact of these changes on your code is that a controller action should return the content

2
extensions/elasticsearch/Connection.php
View File

@ -319,7 +319,7 @@ class Connection extends Component
$body = ''; $body = '';
$options = [ $options = [
CURLOPT_USERAGENT => 'Yii Framework 2 ' . __CLASS__, CURLOPT_USERAGENT => 'Yii Framework ' . Yii::getVersion() . __CLASS__,
CURLOPT_RETURNTRANSFER => false, CURLOPT_RETURNTRANSFER => false,
CURLOPT_HEADER => false, CURLOPT_HEADER => false,
// http://www.php.net/manual/en/function.curl-setopt.php#82418 // http://www.php.net/manual/en/function.curl-setopt.php#82418