Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[jan] Fix returning to last page after problem reporting from AJAX pa…
…ges (Bug #12112).
  • Loading branch information
yunosh committed Jan 18, 2016
1 parent f379501 commit 5a438bf
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion framework/Core/lib/Horde/Registry.php
Expand Up @@ -1472,7 +1472,12 @@ public function getServiceLink($type, $app = null, $full = false)

case 'problem':
return Horde::url('services/problem.php', $full, $opts)
->add('return_url', Horde::selfUrl(true, true, true));
->add(
'return_url',
Horde_Util::getFormData(
'location', Horde::selfUrl(true, true, true)
)
);

case 'sidebar':
return Horde::url('services/sidebar.php', $full, $opts);
Expand Down
2 changes: 2 additions & 0 deletions framework/Core/package.xml
Expand Up @@ -39,6 +39,7 @@
</stability>
<license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
<notes>
* [jan] Fix returning to last page after problem reporting from AJAX pages (Bug #12112).
* [jan] Fix updating group cache with LDAP backend.
* [jan] Horde_Registry_Nlsconfig#validLang() checks now if a locale is installed (Request #10457).
* [jan] Mark PHP 7 as supported.
Expand Down Expand Up @@ -4122,6 +4123,7 @@
<date>2016-01-05</date>
<license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
<notes>
* [jan] Fix returning to last page after problem reporting from AJAX pages (Bug #12112).
* [jan] Fix updating group cache with LDAP backend.
* [jan] Horde_Registry_Nlsconfig#validLang() checks now if a locale is installed (Request #10457).
* [jan] Mark PHP 7 as supported.
Expand Down
3 changes: 2 additions & 1 deletion horde/js/topbar.js
Expand Up @@ -27,7 +27,8 @@ var HordeTopbar = {
{
HordeCore.doAction('topbarUpdate', {
app: this.conf.app,
hash: this.conf.hash
hash: this.conf.hash,
location: window.location.href
}, {
callback: this.onUpdateTopbar.bind(this),
uri: this.conf.URI_AJAX
Expand Down

0 comments on commit 5a438bf

Please sign in to comment.