Page MenuHomeIn-Portal Phabricator

D100.id.diff
No OneTemporary

File Metadata

Created
Fri, Jun 13, 5:32 PM

D100.id.diff

Index: branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js
===================================================================
--- branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js
+++ branches/5.3.x/core/ckeditor/plugins/my_link/plugin.js
@@ -14,7 +14,7 @@
var $internal_page_mapping = {}; // mapping between @@PAGE_ID@@ and real url (for anchor loading)
var load_page_anchors = function ($page_id, dialog) {
- var $url = $internal_page_mapping[$page_id];
+ var $url;
var $tmp_iframe = $('#tmp_iframe');
var $internal_page_anchors = dialog.getContentElement( 'info', 'internalPageAnchors' );
@@ -44,7 +44,10 @@
}
}
- $tmp_iframe.attr('src', $internal_page_mapping[$page_id]);
+ $url = $internal_page_mapping[$page_id];
+ $url += ($url.indexOf('?') ? '&' : '?') + 'skip_last_template=1';
+
+ $tmp_iframe.attr('src', $url);
}
@@ -360,7 +363,7 @@
setup : function( data ) {
var $me = this;
var $link_url = data.url.url;
- var $ajax_url = CKEDITOR.basePath.replace( /core.*$/, 'admin/index.php?events[fck]=OnLoadCmsTree&admin=1' );
+ var $ajax_url = CKEDITOR.basePath.replace( /core.*$/, 'admin/index.php?events[fck]=OnLoadCmsTree' );
var $internal_page_anchors = this.getDialog().getContentElement( 'info', 'internalPageAnchors' );
$('#' + $internal_page_anchors.domId).data('anchor', data.internal_anchor);
@@ -700,4 +703,4 @@
}
);
}
-)();
\ No newline at end of file
+)();

Event Timeline