bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security update core+modules

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sites/all/modules/context/context_ui/context_ui.module
View File

@@ -80,6 +80,10 @@ function context_ui_permission() {
'title' => 'Administer contexts',
'description' => 'Associate menus, views, blocks, etc. with different contexts to structure your site.'
);
$permissions['context ajax block access'] = array(
'title' => t('Access All Blocks'),
'description' => t('Allows users to access all rendered blocks via an AJAX callback. If you have some blocks that should not be rendered for some users but need those users to be able to use context UI, then implement hook_context_allow_ajax_block_access with the necessary logic.'),
);
return $permissions;
}
@@ -367,7 +371,7 @@ function context_ui_page_alter(&$page) {
*/
function context_ui_menu_contextual_links_alter(&$links, $router_item, $root_path) {
if(context_ui_dialog_is_enabled() &&
!context_isset('context_ui', 'context_ui_editor_present')) {
!context_isset('context_ui', 'context_ui_editor_present') && user_access('administer contexts')) {
$links['layout'] = array(
'href' => 'context-ui/activate',
'title' => t('Configure Layout'),
@@ -383,8 +387,10 @@ function context_ui_menu_contextual_links_alter(&$links, $router_item, $root_pat
* A page call back to activate the context_ui inline editor dialog.
*/
function context_ui_activate() {
$_SESSION['context_ui_active'] = $_GET['destination'];
drupal_goto($_GET['destination']);
if (isset($_GET['destination']) && !url_is_external($_GET['destination'])) {
$_SESSION['context_ui_active'] = $_GET['destination'];
drupal_goto($_GET['destination']);
}
}
/**
@@ -394,8 +400,10 @@ function context_ui_activate() {
* to navigate to when deactivating context_ui_editor
*/
function context_ui_deactivate() {
$_SESSION['context_ui_active'] = FALSE;
drupal_goto($_GET['destination']);
if (isset($_GET['destination']) && !url_is_external($_GET['destination'])) {
$_SESSION['context_ui_active'] = FALSE;
drupal_goto($_GET['destination']);
}
}
/**