security update core+modules

sites/all/modules/context/context_ui/README.txt

@@ -9,8 +9,6 @@ are built and can be turned off on most production sites.
 Requirements
 ------------
 - Context, Context UI modules enabled (`admin/modules`)
-- [jQuery UI 1.x][1] and [Admin 2.x][2] to use the inline context editor.
-  Optional.
 
 
 Basic usage
@@ -59,16 +57,17 @@ be configured.
 
 Using the inline editor
 -----------------------
-If you have installed jQuery UI and Admin, you can enable the inline context
-editor:
+The inline editor allows you to manage the block reaction for active
+contexts within the context of a page rather than through the admin
+interface. This can also be helpful when managing block ordering among
+multiple contexts.
 
-1. As an administrative user go to `admin/settings/admin`.
-2. Check the 'Context editor' block and save.
-3. When viewing a page with one or more active contexts, you will see the
-  `Context editor` in the admin toolbar.
+1. As an administrative user go to `admin/structure/context/settings`.
+2. Check the 'Use Context Editor Dialog' block and save. You should also
+   check the show all regions box.
+3. When viewing a page with one or more active contexts, you will see
+   the option to configure layout in the contextual links on all blocks
+   on the page. This will allow you to manage the blocks placed by the
+   block reaction for contexts.
 4. You can use the context editor to adjust the conditions under which each
-  context is active and alter its reactions.
-
-
-[1]: http://drupal.org/project/jquery_ui
-[2]: http://drupal.org/project/admin
+   context is active and alter its reactions.

sites/all/modules/context/context_ui/context_ui.info

@@ -8,9 +8,9 @@ configure = admin/structure/context
 files[] = context.module
 files[] = tests/context_ui.test
 
-; Information added by drupal.org packaging script on 2012-12-19
-version = "7.x-3.0-beta6"
+; Information added by Drupal.org packaging script on 2015-01-06
+version = "7.x-3.6"
 core = "7.x"
 project = "context"
-datestamp = "1355879811"
+datestamp = "1420573188"
 

sites/all/modules/context/context_ui/context_ui.js

@@ -98,7 +98,7 @@ Drupal.behaviors.context_ui = { attach: function(context) {
   });
 
   // Initialize context editor.
-  if (jQuery().pageEditor) {
+  if ($().pageEditor) {
     $('form.context-editor:not(.context-ui-processed)')
       .addClass('context-ui-processed')
       .pageEditor()

sites/all/modules/context/context_ui/context_ui.module

@@ -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']);
+  }
 }
 
 /**

sites/all/modules/context/context_ui/context_ui_dialog.css

@@ -7,11 +7,11 @@
   color: #222;
 }
 #context_ui_dialog-context-ui ul {
-	margin: 0;
+  margin: 0;
 }
 #context_ui_dialog-context-ui ul li {
-	padding: 4px 0;
-	list-style: none;
+  padding: 4px 0;
+  list-style: none;
 }
 
 #context_ui_dialog-context-ui .buttons {
@@ -21,7 +21,7 @@
 #context_ui_dialog-context-ui div.admin-pane-condition,
 #context_ui_dialog-context-ui div.admin-pane-reaction-theme,
 #context_ui_dialog-context-ui div.admin-pane-reaction-theme_html {
-	display: none;
+  display: none;
 }
 
 .boxes-box-editing {
@@ -31,8 +31,8 @@
 }
 
 body.context-editing div.contextual-links-wrapper {
-	right: 0;
-	top: 40px;
+  right: 0;
+  top: 40px;
 }
 
 #context_ui_dialog-context-ui a.context_ui_dialog-stop,
@@ -70,6 +70,7 @@ form.context-editing li.context-editing {
   background:#fff;
   color:#222;
   top:140px;
+  left: 0px;
   display:none;
   z-index:400;
   padding:10px;

sites/all/modules/context/context_ui/export_ui/context_export_ui.class.php

@@ -73,6 +73,7 @@ class context_export_ui extends ctools_export_ui {
     if (!empty($this->plugin['form']['submit'])) {
       $this->plugin['form']['submit']($form, $form_state);
     }
+    context_invalidate_cache();
   }
 
   /**

sites/all/modules/context/context_ui/tests/context_ui.test

@@ -24,6 +24,7 @@ class ContextUiTestCase extends DrupalWebTestCase {
     $admin_user = $this->drupalCreateUser(array(
       'access administration pages',
       'administer site configuration',
+      'administer contexts',
       'access content',
       'create blog content'
     ));