Merge remote-tracking branch 'upstream/master'

docs/guide-ru/start-installation.md

@@ -59,7 +59,7 @@ Composer установит Yii (шаблонное приложение basic)
 
 1. Скачайте архив с [yiiframework.com](http://www.yiiframework.com/download/);
 2. Распакуйте скачанный архив в папку, доступную из Web.
-3. В файле `config/web.php` добавьте сектетный ключ в значение `cookieValidationKey` (при установке через Composer
+3. В файле `config/web.php` добавьте секретный ключ в значение `cookieValidationKey` (при установке через Composer
    это происходит автоматически):
 
    ```php

docs/guide/tutorial-i18n.md

@@ -57,13 +57,13 @@ The format for the language/locale is `ll-CC` where `ll` is a two- or three-lett
 Message translation
 -------------------
 
-Message translation is used to translate messages that are ouput by an applicaiton to different languages
+Message translation is used to translate messages that are output by an application to different languages
 so that users from different countries can use the application in their native language.
 
 The message translation feature in Yii works simply as finding a
 translation of the message from a source language into a target language.
 To use the message translation feature you wrap your original message strings with a call to the [[Yii::t()]] method.
-The first parameter of this method takes a category which helps to distingish the source of messages in differnet parts
+The first parameter of this method takes a category which helps to distinguish the source of messages in different parts
 of the application and the second parameter is the message itself.
 
 ```php
@@ -501,7 +501,7 @@ Yii uses the [PHP intl extension](http://php.net/manual/en/book.intl.php) to pro
 such as the number and date formatting of the [[yii\i18n\Formatter]] class and the message formatting using [[yii\i18n\MessageFormatter]].
 Both classes provides a fallback implementation that provides basic functionality in case intl is not installed.
 This fallback implementation however only works well for sites in english language and even there can not provide the
-rich set of features that is avialable with the PHP intl extension, so its installation is highly recommended.
+rich set of features that is available with the PHP intl extension, so its installation is highly recommended.
 
 The [PHP intl extension](http://php.net/manual/en/book.intl.php) is based on the [ICU library](http://site.icu-project.org/) which
 provides the knowledge and formatting rules for all the different locales. According to this fact the formatting of dates and numbers

framework/CHANGELOG.md

@@ -25,6 +25,7 @@ Yii Framework 2 Change Log
 - Bug #5893: `yii\helpers\ArrayHelper::toArray()` now applies `$properties` parameter for converting descending objects in recursive calls (otsec)
 - Bug #5925: `ArrayHelper::htmlEncode()` does not work properly when the value being encoded is a nested array (tebazil)
 - Bug #5997: The same message may be exported twice to log targets (klimov-paul)
+- Bug #6018: When setting the `encode` option via `yii\widgets\ActiveRecord::errorOptions`, it works the other way around (stanishevsky, qiangxue)
 - Bug: Gii console command help information does not contain global options (qiangxue)
 - Bug: `yii\web\UrlRule` was unable to create URLs for rules containing unicode characters (samdark)
 - Enh #4181: Added `yii\bootstrap\Modal::$headerOptions` and `yii\bootstrap\Modal::$footerOptions` (tuxoff, samdark)

framework/log/migrations/m141106_185632_log_init.php

@@ -65,7 +65,7 @@ class m141106_185632_log_init extends Migration
                 'id' => Schema::TYPE_BIGPK,
                 'level' => Schema::TYPE_INTEGER,
                 'category' => Schema::TYPE_STRING,
-                'log_time' => Schema::TYPE_INTEGER,
+                'log_time' => Schema::TYPE_FLOAT,
                 'prefix' => Schema::TYPE_TEXT,
                 'message' => Schema::TYPE_TEXT,
             ], $tableOptions);

framework/log/migrations/schema-mssql.sql

@@ -19,7 +19,7 @@ create table [log]
    [id]          bigint IDENTITY PRIMARY KEY,
    [level]       integer,
    [category]    varchar(255),
-   [log_time]    integer,
+   [log_time]    float,
    [prefix]      text,
    [message]     text
 );

framework/log/migrations/schema-mysql.sql

@@ -19,7 +19,7 @@ create table `log`
    `id`          bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
    `level`       integer,
    `category`    varchar(255),
-   `log_time`    integer,
+   `log_time`    float,
    `prefix`      text,
    `message`     text,
    key `idx_log_level` (`level`),

framework/log/migrations/schema-oci.sql

@@ -19,7 +19,7 @@ create table "log"
    "id"          number(20) NOT NULL PRIMARY KEY,
    "level"       integer,
    "category"    varchar(255),
-   "log_time"    integer,
+   "log_time"    float,
    "prefix"      text,
    "message"     text,
    key "idx_log_level" ("level"),

framework/log/migrations/schema-pgsql.sql

@@ -19,7 +19,7 @@ create table "log"
    "id"          bigserial NOT NULL PRIMARY KEY,
    "level"       integer,
    "category"    varchar(255),
-   "log_time"    integer,
+   "log_time"    real,
    "prefix"      text,
    "message"     text
 );

framework/log/migrations/schema-sqlite.sql

@@ -19,7 +19,7 @@ create table "log"
    "id"          integer PRIMARY KEY AUTOINCREMENT NOT NULL,
    "level"       integer,
    "category"    varchar(255),
-   "log_time"    integer,
+   "log_time"    float,
    "prefix"      text,
    "message"     text
 );

framework/widgets/ActiveField.php

@@ -737,7 +737,7 @@ class ActiveField extends Component
             $options['error'] = isset($this->errorOptions['tag']) ? $this->errorOptions['tag'] : 'span';
         }
 
-        $options['encodeError'] = !isset($this->errorOptions['encode']) || !$this->errorOptions['encode'];
+        $options['encodeError'] = !isset($this->errorOptions['encode']) || $this->errorOptions['encode'];
         if ($enableAjaxValidation) {
             $options['enableAjaxValidation'] = true;
         }