php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-13 20:59:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DrDeath72-patch-9'

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2016-03-20 17:06:28 +02:00
parent 0c462226fe 8757088f5f
commit 08b9f12afa
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -14,6 +14,7 @@ Yii Framework 2 Change Log
- Bug #10974: `yii.js` - fixed error in ajaxPrefilter event handler, caused by blocked frame (maximal) - Bug #10974: `yii.js` - fixed error in ajaxPrefilter event handler, caused by blocked frame (maximal)
- Bug #11038: Fixed handling of intervals of 0 seconds in `yii\i18n\Formatter::asDuration()` (VirtualRJ) - Bug #11038: Fixed handling of intervals of 0 seconds in `yii\i18n\Formatter::asDuration()` (VirtualRJ)
- Bug #11052: Fixed `HtmlPurifier` configuration sequence (samdark) - Bug #11052: Fixed `HtmlPurifier` configuration sequence (samdark)
- Bug #11066: `yii.js` - fixed `getQueryParams()` function to handle URLs with anchors correctly (DrDeath72)
- Bug #11093: Fixed `yii\db\QueryBuilder::buildAndCondition()` to add query params passed directly by `yii\db\Expression` (CedricYii, silverfire) - Bug #11093: Fixed `yii\db\QueryBuilder::buildAndCondition()` to add query params passed directly by `yii\db\Expression` (CedricYii, silverfire)
- Bug #11125: Fixed `JSON_ERROR_SYNTAX` for `json_decode(null)` in PHP 7 (fps01) - Bug #11125: Fixed `JSON_ERROR_SYNTAX` for `json_decode(null)` in PHP 7 (fps01)
- Bug: SQlite querybuilder did not create primary key with bigint for `TYPE_BIGPK` (cebe) - Bug: SQlite querybuilder did not create primary key with bigint for `TYPE_BIGPK` (cebe)

2
framework/assets/yii.js
View File

@@ -277,7 +277,7 @@ yii = (function ($) {
return {}; return {};
} }
var pairs = url.substring(pos + 1).split('&'), var pairs = url.substring(pos + 1).split('#')[0].split('&'),
params = {}, params = {},
pair, pair,
i; i;