mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-14 02:34:24 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1712

Browse Source
This commit is contained in:
Ryan Cramer
2023-03-30 09:28:24 -04:00
parent 371ea35036
commit 7352d1d7f3
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wire/modules/Process/ProcessPageList/ProcessPageList.module
View File

@@ -178,6 +178,10 @@ class ProcessPageList extends Process implements ConfigurableModule {
$langID = (int) $input->get('lang'); $langID = (int) $input->get('lang');
if($langID) $this->wire('user')->language = $this->languages->get($langID); if($langID) $this->wire('user')->language = $this->languages->get($langID);
$this->trashLabel = $this->_('Trash'); // Label for 'Trash' page in PageList // Overrides page title if used $this->trashLabel = $this->_('Trash'); // Label for 'Trash' page in PageList // Overrides page title if used
/** @var JqueryUI $jQueryUI */
$jQueryUI = $this->wire()->modules->get('JqueryUI');
$jQueryUI->use('vex'); // for alert boxes
$id = $input->get('id'); $id = $input->get('id');
if($id === 'bookmark') $this->wire('session')->redirect('./bookmarks/'); if($id === 'bookmark') $this->wire('session')->redirect('./bookmarks/');

6
wire/templates-admin/scripts/main.js
View File

@@ -497,6 +497,12 @@ if(typeof ProcessWire != "undefined") {
if(allowMarkup) { if(allowMarkup) {
vex.dialog.alert({unsafeMessage: message}); vex.dialog.alert({unsafeMessage: message});
} else { } else {
if(message.indexOf('&') > -1 && message.indexOf(';') > 1) {
// remove entitity encoded sequences since Vex already encodes
var v = document.createElement('textarea');
v.innerHTML = message;
message = v.value;
}
vex.dialog.alert(message); vex.dialog.alert(message);
} }
} else { } else {

2
wire/templates-admin/scripts/main.min.js vendored
View File

File diff suppressed because one or more lines are too long