Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2176721 by maartendeblock, nod_: 'Back to site' button does not preserve URL's language prefix and querystring.

8.0.x
Nathaniel Catchpole 2014-02-03 14:42:59 +00:00
parent b3e112fe67
commit 8fe0fd00a5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/toolbar/js/escapeAdmin.js
View File

@ -9,13 +9,14 @@
var pathInfo = drupalSettings.path; var pathInfo = drupalSettings.path;
var escapeAdminPath = sessionStorage.getItem('escapeAdminPath'); var escapeAdminPath = sessionStorage.getItem('escapeAdminPath');
var windowLocation = window.location;
// Saves the last non-administrative page in the browser to be able to link back // Saves the last non-administrative page in the browser to be able to link back
// to it when browsing administrative pages. If there is a destination parameter // to it when browsing administrative pages. If there is a destination parameter
// there is not need to save the current path because the page is loaded within // there is not need to save the current path because the page is loaded within
// an existing "workflow". // an existing "workflow".
if (!pathInfo.currentPathIsAdmin && !/destination=/.test(window.location.search)) { if (!pathInfo.currentPathIsAdmin && !/destination=/.test(windowLocation.search)) {
sessionStorage.setItem('escapeAdminPath', pathInfo.currentPath); sessionStorage.setItem('escapeAdminPath', windowLocation.pathname.substring(pathInfo.basePath.length) + windowLocation.search);
} }
/** /**