Skip to content

Commit

Permalink
Fixes #3458: Fixed CGridView with enableHistory breaks queries contai…
Browse files Browse the repository at this point in the history
…ning '&' characters
  • Loading branch information
samdark committed Jan 8, 2016
1 parent a8238ca commit 8b4dab8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -9,6 +9,7 @@ Version 1.1.17 work in progress
- Bug #2921: Fixed CStatePersister read/write concurrency issue causing state data corruption (matteosistisette, samdark)
- Bug #2993: Fixed MySQL datetime fields can have default CURRENT_TIMESTAMP (tomvdp)
- Bug #3144: Fixed regression introduced in 1.1.16, whitespace before and after attributes in validation rules where not ignored (cebe)
- Bug #3458: Fixed CGridView with enableHistory breaks queries containing '&' characters (samdark)
- Bug #3476: Database sessions with Postgres did not work properly (c-schmitz)
- Bug #3497: CErrorHandler messages for HTTP response codes were not matching RFCs (TeMPOraL)
- Bug #3637: Fixed not quoting primary key in count statements (applee)
Expand Down
4 changes: 2 additions & 2 deletions framework/zii/widgets/assets/gridview/jquery.yiigridview.js
Expand Up @@ -100,7 +100,7 @@
delete params[settings.ajaxVar];

var updateUrl = $.param.querystring(url[0], params);
window.History.pushState({url: updateUrl}, document.title, decodeURIComponent(updateUrl));
window.History.pushState({url: updateUrl}, document.title, updateUrl);
}
} else {
$('#' + id).yiiGridView('update', {url: $(this).attr('href')});
Expand Down Expand Up @@ -137,7 +137,7 @@
delete params[settings.ajaxVar];

var updateUrl = $.param.querystring(url.substr(0, url.indexOf('?')), params);
window.History.pushState({url: updateUrl}, document.title, decodeURIComponent(updateUrl));
window.History.pushState({url: updateUrl}, document.title, updateUrl);
} else {
$('#' + id).yiiGridView('update', {data: data});
}
Expand Down

2 comments on commit 8b4dab8

@nkovacs
Copy link
Contributor

@nkovacs nkovacs commented on 8b4dab8 Jan 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incomplete. Here is the complete fix: #3444

@cebe
Copy link
Member

@cebe cebe commented on 8b4dab8 Jan 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for reference: 52f253c

Please sign in to comment.