diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 98a6bbe..b6a23fa 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1929,7 +1929,6 @@ function theme_table($variables) { $i=0; foreach ($header as $cell) { $i++; - // Track responsive classes for each column as needed. if (!empty($cell['class']) && is_array($cell['class'])) { if (in_array(RWD_ADVISABLE, $cell['class'])) { @@ -1939,11 +1938,9 @@ function theme_table($variables) { $responsive[$i] = RWD_HELPFUL; } } - $cell = tablesort_header($cell, $header, $ts); $output .= _theme_table_cell($cell, TRUE); } - // Using ternary operator to close the tags based on whether or not there are rows $output .= (count($rows) ? " \n" : "\n"); } @@ -1987,7 +1984,6 @@ function theme_table($variables) { $i++; // Add active class if needed for sortable tables. $cell = tablesort_cell($cell, $header, $ts, $i); - // Copy advisable/helpful class from header to cell as needed. if (isset($responsive[$i])) { if (is_array($cell)) { @@ -1997,7 +1993,6 @@ function theme_table($variables) { $cell = array('data' => $cell, 'class' => $responsive[$i]); } } - $output .= _theme_table_cell($cell); } $output .= " \n"; diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 03290a6..3e22931 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1297,26 +1297,12 @@ function system_library_info() { ), ); - // Drupal's tableheader library. - $libraries['drupal.tableheader'] = array( - 'title' => 'Drupal tableheader API', - 'version' => VERSION, - 'js' => array( - 'core/misc/tableheader.js' => array('group' => JS_LIBRARY,), - ), - 'dependencies' => array( - array('system', 'jquery'), - array('system', 'drupal'), - array('system', 'jquery.once'), - ), - ); - // Drupal's tabledrag library. $libraries['drupal.tabledrag'] = array( 'title' => 'Drupal tabledrag', 'version' => VERSION, 'js' => array( - 'core/misc/tabledrag.js' => array('group' => JS_LIBRARY, 'cache' => FALSE), + 'core/misc/tabledrag.js' => array('group' => JS_LIBRARY, 'weight' => -1), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc index 4ccc806..ea97c44 100644 --- a/core/modules/user/user.admin.inc +++ b/core/modules/user/user.admin.inc @@ -1051,3 +1051,4 @@ function user_admin_role_delete_confirm_submit($form, &$form_state) { drupal_set_message(t('The role has been deleted.')); $form_state['redirect'] = 'admin/people/roles'; } +