FINAL suepr merge step : added all modules to this super repos

sites/all/modules/contrib/views/views/handlers/views_handler_field.inc

@@ -372,7 +372,7 @@ class views_handler_field extends views_handler {
    *   Optional name of the field where the value is stored.
    */
   function get_value($values, $field = NULL) {
-    $alias = isset($field) && isset($this->aliases[$field]) ? $this->aliases[$field] : $this->field_alias;
+    $alias = isset($field) ? $this->aliases[$field] : $this->field_alias;
     if (isset($values->{$alias})) {
       return $values->{$alias};
     }

sites/all/modules/contrib/views/views/js/views-admin.js

@@ -255,10 +255,11 @@ Drupal.behaviors.viewsUiRenderAddViewButton.attach = function (context, settings
   // away from the item. We use mouseleave instead of mouseout because
   // the user is going to trigger mouseout when she moves from the trigger
   // link to the sub menu items.
-  // We use the live binder because the open class on this item will be
+  //
+  // We use the 'li.add' selector because the open class on this item will be
   // toggled on and off and we want the handler to take effect in the cases
   // that the class is present, but not when it isn't.
-  $('li.add', $menu).live('mouseleave', function (event) {
+  $menu.delegate('li.add', 'mouseleave', function (event) {
     var $this = $(this);
     var $trigger = $this.children('a[href="#"]');
     if ($this.children('.action-list').is(':visible')) {

sites/all/modules/contrib/views/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc

@@ -96,7 +96,6 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
         $query = db_select('taxonomy_term_data', 'td');
         $query->leftJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
         $query->fields('td');
-        $query->fields('tv', array('machine_name'));
         $query->condition('td.tid', $argument);
         $query->addTag('term_access');
         $term = $query->execute()->fetchObject();
@@ -105,7 +104,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
         }
         $term = taxonomy_term_load($term->tid);
         $this->argument->validated_title = check_plain(entity_label('taxonomy_term', $term));
-        return empty($vocabularies) || !empty($vocabularies[$term->machine_name]);
+        return empty($vocabularies) || !empty($vocabularies[$term->vocabulary_machine_name]);
 
       case 'tids':
         // An empty argument is not a term so doesn't pass.

sites/all/modules/contrib/views/views/plugins/views_plugin_display_page.inc

@@ -30,6 +30,7 @@ class views_plugin_display_page extends views_plugin_display {
         'weight' => array('default' => 0),
         'name' => array('default' => variable_get('menu_default_node_menu', 'navigation')),
         'context' => array('default' => ''),
+        'context_only_inline' => array('default' => FALSE),
        ),
     );
     $options['tab_options'] = array(
@@ -153,7 +154,7 @@ class views_plugin_display_page extends views_plugin_display {
       // Add context for contextual links.
       // @see menu_contextual_links()
       if (!empty($menu['context'])) {
-        $items[$path]['context'] = MENU_CONTEXT_INLINE;
+        $items[$path]['context'] = !empty($menu['context_only_inline']) ? MENU_CONTEXT_INLINE : (MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE);
       }
 
       // If this is a 'default' tab, check to see if we have to create teh
@@ -386,12 +387,23 @@ class views_plugin_display_page extends views_plugin_display {
         );
         $form['menu']['context'] = array(
           '#title' => t('Context'),
-          '#suffix' => '</div>',
           '#type' => 'checkbox',
           '#default_value' => !empty($menu['context']),
           '#description' => t('Displays the link in contextual links'),
           '#dependency' => array('radio:menu[type]' => array('tab')),
         );
+        $form['menu']['context_only_inline'] = array(
+          '#title' => t('Hide menu tab'),
+          '#suffix' => '</div>',
+          '#type' => 'checkbox',
+          '#default_value' => !empty($menu['context_only_inline']),
+          '#description' => t('Only display menu item entry in contextual links. Menu tab should not be displayed.'),
+          '#dependency' => array(
+            'radio:menu[type]' => array('tab'),
+            'edit-menu-context' => array(1),
+          ),
+          '#dependency_count' => 2,
+        );
         break;
       case 'tab_options':
         $form['#title'] .= t('Default tab options');

sites/all/modules/contrib/views/views/tests/views_test.info

@@ -5,9 +5,9 @@ core = 7.x
 dependencies[] = views
 hidden = TRUE
 
-; Information added by drupal.org packaging script on 2013-03-20
-version = "7.x-3.6"
+; Information added by drupal.org packaging script on 2013-04-09
+version = "7.x-3.7"
 core = "7.x"
 project = "views"
-datestamp = "1363810217"
+datestamp = "1365499236"
 

sites/all/modules/contrib/views/views/views.api.php

@@ -482,13 +482,15 @@ function hook_views_data_alter(&$data) {
   $data['users']['example_field'] = array(
     'title' => t('Example field'),
     'help' => t('Some example content that references a user'),
-    'handler' => 'hook_handlers_field_example_field',
+    'field' => array(
+      'handler' => 'modulename_handler_field_example_field',
+    ),
   );
 
   // This example changes the handler of the node title field.
   // In this handler you could do stuff, like preview of the node when clicking
   // the node title.
-  $data['node']['title']['handler'] = 'modulename_handlers_field_node_title';
+  $data['node']['title']['field']['handler'] = 'modulename_handler_field_node_title';
 
   // This example adds a relationship to table {foo}, so that 'foo' views can
   // add this table using a relationship. Because we don't want to write over

sites/all/modules/contrib/views/views/views.info

@@ -312,9 +312,9 @@ files[] = tests/views_cache.test
 files[] = tests/views_view.test
 files[] = tests/views_ui.test
 
-; Information added by drupal.org packaging script on 2013-03-20
-version = "7.x-3.6"
+; Information added by drupal.org packaging script on 2013-04-09
+version = "7.x-3.7"
 core = "7.x"
 project = "views"
-datestamp = "1363810217"
+datestamp = "1365499236"
 

sites/all/modules/contrib/views/views/views_ui.info

@@ -7,9 +7,9 @@ dependencies[] = views
 files[] = views_ui.module
 files[] = plugins/views_wizard/views_ui_base_views_wizard.class.php
 
-; Information added by drupal.org packaging script on 2013-03-20
-version = "7.x-3.6"
+; Information added by drupal.org packaging script on 2013-04-09
+version = "7.x-3.7"
 core = "7.x"
 project = "views"
-datestamp = "1363810217"
+datestamp = "1365499236"