Commit 3e85e7e1 authored by frjo's avatar frjo
Browse files

#789450: IMCE Editor conflict with Colorbox, added imce to default path where...

#789450: IMCE Editor conflict with Colorbox, added imce to default path where Colorbox is not active.
parent 9c44511f
......@@ -322,7 +322,7 @@ function colorbox_admin_settings() {
$form['colorbox_advanced_settings']['colorbox_pages'] = array(
'#type' => 'textarea',
'#title' => t('Deactivate Colorbox on specific pages'),
'#default_value' => variable_get('colorbox_pages', "admin*\nimg_assist*\nnode/add/*\nnode/*/edit"),
'#default_value' => variable_get('colorbox_pages', "admin*\nimg_assist*\nimce*\nnode/add/*\nnode/*/edit"),
'#description' => t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>')),
);
......
......@@ -110,7 +110,7 @@ function _colorbox_form_page_access($form_id) {
function _colorbox_active() {
// Code from the block_list funtion in block.module.
$path = drupal_get_path_alias($_GET['q']);
$colorbox_pages = variable_get('colorbox_pages', "admin*\nimg_assist*\nnode/add/*\nnode/*/edit");
$colorbox_pages = variable_get('colorbox_pages', "admin*\nimg_assist*\nimce*\nnode/add/*\nnode/*/edit");
// Compare with the internal and path alias (if any).
$page_match = drupal_match_path($path, $colorbox_pages);
if ($path != $_GET['q']) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment