security update core+modules

2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions
--- a/sites/all/modules/context/plugins/context_condition_menu.inc
+++ b/sites/all/modules/context/plugins/context_condition_menu.inc
@@ -41,8 +41,10 @@ class context_condition_menu extends context_condition {
   */
  function condition_form($context) {
    $form = parent::condition_form($context);
+    $menu_count = count($form['#options'], COUNT_RECURSIVE);
    $form['#type'] = 'select';
    $form['#multiple'] = TRUE;
+    $form['#attributes'] = array('size' => $menu_count > 20 ? 20 : $menu_count);
    return $form;
  }