From ebaa0f1cdefe06324a7e331e9d09eb1fc8256479 Mon Sep 17 00:00:00 2001 From: Tim Plunkett <git@plnktt.com> Date: Wed, 29 Aug 2012 17:21:27 -0400 Subject: [PATCH] Miscellaneous code clean-ups. --- css/views-admin.css | 2 -- drush/views.drush.inc | 1 - includes/ajax.inc | 1 - js/views-admin.js | 6 ------ lib/Drupal/views/Plugin/views/query/QueryInterface.php | 1 + lib/Drupal/views/Plugin/views/query/QueryPluginBase.php | 1 + lib/Drupal/views/Plugin/views/query/Sql.php | 1 + lib/Drupal/views/TempStore/TempStore.php | 1 + lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php | 1 + lib/Drupal/views/Tests/Handler/ArgumentStringTest.php | 2 ++ lib/Drupal/views/Tests/ViewStorageTest.php | 1 + lib/Drupal/views/ViewStorageInterface.php | 1 + lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php | 1 - lib/Views/comment/Plugin/views/row/Rss.php | 2 -- lib/Views/comment/Plugin/views/row/View.php | 1 - lib/Views/field/Plugin/views/argument/FieldList.php | 1 - lib/Views/field/Plugin/views/argument/ListString.php | 1 - lib/Views/file/Plugin/views/field/File.php | 1 - lib/Views/node/Plugin/views/argument/UidRevision.php | 2 +- lib/Views/node/Plugin/views/field/Path.php | 2 +- lib/Views/node/Plugin/views/row/Rss.php | 3 +-- lib/Views/node/Plugin/views/wizard/Node.php | 2 -- lib/Views/search/Plugin/views/filter/Search.php | 2 +- lib/Views/taxonomy/Plugin/views/argument_validator/Term.php | 1 - lib/Views/taxonomy/Plugin/views/field/Taxonomy.php | 1 - lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php | 1 - .../taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php | 1 - lib/Views/user/Plugin/views/row/View.php | 3 +-- modules/aggregator.views.inc | 1 - modules/comment.views.inc | 2 -- modules/field.views.inc | 1 - modules/node.views.inc | 1 - modules/statistics.views.inc | 2 -- modules/taxonomy.views.inc | 2 -- modules/translation.views.inc | 1 - modules/user.views.inc | 1 - plugins/export_ui/views_ui.class.php | 1 - .../Drupal/views_test/Plugin/views/access/DynamicTest.php | 2 ++ .../Drupal/views_test/Plugin/views/access/StaticTest.php | 2 ++ .../Plugin/views/localization/LocalizationTest.php | 2 ++ theme/theme.inc | 3 --- views.api.php | 1 - views.module | 2 -- views_ui.module | 4 ---- 44 files changed, 20 insertions(+), 52 deletions(-) diff --git a/css/views-admin.css b/css/views-admin.css index 7ce708820f37..b98a4bc27d35 100644 --- a/css/views-admin.css +++ b/css/views-admin.css @@ -312,8 +312,6 @@ div.form-item-options-value-all { /* @end */ - - /* @group Javascript dependent styling */ .js-only { diff --git a/drush/views.drush.inc b/drush/views.drush.inc index 2c0aa63ce02d..438433939ae1 100644 --- a/drush/views.drush.inc +++ b/drush/views.drush.inc @@ -255,7 +255,6 @@ function views_development_settings() { drush_log($message, 'success'); } - /** * Callback function for views-list command. */ diff --git a/includes/ajax.inc b/includes/ajax.inc index 62b6b4d712d3..00f87e7cd9d0 100644 --- a/includes/ajax.inc +++ b/includes/ajax.inc @@ -276,7 +276,6 @@ function views_ajax_form_wrapper($form_id, &$form_state) { return $output; } - /** * Page callback for views user autocomplete */ diff --git a/js/views-admin.js b/js/views-admin.js index b33b087dc3e0..ccddc5e5a37d 100644 --- a/js/views-admin.js +++ b/js/views-admin.js @@ -236,7 +236,6 @@ Drupal.viewsUi.addItemForm.prototype.handleCheck = function (event) { this.refreshCheckedItems(); }; - /** * Refresh the display of the checked items. */ @@ -249,7 +248,6 @@ Drupal.viewsUi.addItemForm.prototype.refreshCheckedItems = function() { Drupal.viewsUi.resizeModal('', true); }; - /** * The input field items that add displays must be rendered as <input> elements. * The following behavior detaches the <input> elements from the DOM, wraps them @@ -318,7 +316,6 @@ Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu = function ($trigger) { $trigger.next().slideToggle('fast'); }; - Drupal.behaviors.viewsUiSearchOptions = {}; Drupal.behaviors.viewsUiSearchOptions.attach = function (context) { @@ -440,7 +437,6 @@ Drupal.viewsUi.OptionsSearch.prototype.handleKeyup = function (event) { } }; - Drupal.behaviors.viewsUiPreview = {}; Drupal.behaviors.viewsUiPreview.attach = function (context, settings) { @@ -471,7 +467,6 @@ Drupal.behaviors.viewsUiPreview.attach = function (context, settings) { } }; - Drupal.behaviors.viewsUiRearrangeFilter = {}; Drupal.behaviors.viewsUiRearrangeFilter.attach = function (context, settings) { @@ -763,7 +758,6 @@ Drupal.viewsUi.rearrangeFilterHandler.prototype.modifyTableDrag = function () { }; }; - /** * Redraw the operator labels that are displayed next to each filter. */ diff --git a/lib/Drupal/views/Plugin/views/query/QueryInterface.php b/lib/Drupal/views/Plugin/views/query/QueryInterface.php index 54714c8a8e36..0b00a1765dee 100644 --- a/lib/Drupal/views/Plugin/views/query/QueryInterface.php +++ b/lib/Drupal/views/Plugin/views/query/QueryInterface.php @@ -1,6 +1,7 @@ <?php /** + * @file * Definition of Drupal\views\Plugin\query\QueryInterface. */ diff --git a/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php index 72dbf69118fb..a52f23ded4dc 100644 --- a/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php +++ b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php @@ -1,6 +1,7 @@ <?php /** + * @file * Definition of Drupal\views\Plugin\views\query\QueryPluginBase. */ diff --git a/lib/Drupal/views/Plugin/views/query/Sql.php b/lib/Drupal/views/Plugin/views/query/Sql.php index 0ae9aa653cec..9146d4f6be7f 100644 --- a/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/lib/Drupal/views/Plugin/views/query/Sql.php @@ -23,6 +23,7 @@ * ) */ class Sql extends QueryPluginBase { + /** * A list of tables in the order they should be added, keyed by alias. */ diff --git a/lib/Drupal/views/TempStore/TempStore.php b/lib/Drupal/views/TempStore/TempStore.php index 2b4dcfb055c6..73be438855e5 100644 --- a/lib/Drupal/views/TempStore/TempStore.php +++ b/lib/Drupal/views/TempStore/TempStore.php @@ -7,6 +7,7 @@ namespace Drupal\views\TempStore; + /** * Handles reading and writing to a non-volatile temporary storage area. * diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php index 10f922f8f667..cd8659075adf 100644 --- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php +++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php @@ -18,6 +18,7 @@ * Check revisions */ class HandlerFieldFieldTest extends FieldTestBase { + public $nodes; public static function getInfo() { diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php index f744df3278f8..5059022850fb 100644 --- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php +++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php @@ -13,6 +13,7 @@ * Tests the core Drupal\views\Plugin\views\argument\String handler. */ class ArgumentStringTest extends HandlerTestBase { + public static function getInfo() { return array( 'name' => 'Argument: String', @@ -98,4 +99,5 @@ function viewGlossary() { return $view; } + } diff --git a/lib/Drupal/views/Tests/ViewStorageTest.php b/lib/Drupal/views/Tests/ViewStorageTest.php index d0e8ae70c07c..08a5fc6a9b93 100644 --- a/lib/Drupal/views/Tests/ViewStorageTest.php +++ b/lib/Drupal/views/Tests/ViewStorageTest.php @@ -1,6 +1,7 @@ <?php /** + * @file * Definition of Drupal\views\Tests\ViewStorageTest. */ diff --git a/lib/Drupal/views/ViewStorageInterface.php b/lib/Drupal/views/ViewStorageInterface.php index 1eef09967283..6a65f3772c30 100644 --- a/lib/Drupal/views/ViewStorageInterface.php +++ b/lib/Drupal/views/ViewStorageInterface.php @@ -1,6 +1,7 @@ <?php /** + * @file * Definition of Drupal\views\ViewStorageInterface. */ diff --git a/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php index 5266bd0664a2..b2dce6e7bccb 100644 --- a/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php +++ b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php @@ -10,7 +10,6 @@ use Drupal\views\Plugin\views\filter\Date; use Drupal\Core\Annotation\Plugin; - /** * Filter handler for the newer of last comment / node updated. * diff --git a/lib/Views/comment/Plugin/views/row/Rss.php b/lib/Views/comment/Plugin/views/row/Rss.php index 4018bd12cf43..1050f99c0d51 100644 --- a/lib/Views/comment/Plugin/views/row/Rss.php +++ b/lib/Views/comment/Plugin/views/row/Rss.php @@ -54,7 +54,6 @@ function options_form(&$form, &$form_state) { ); } - function pre_render($result) { $cids = array(); $nids = array(); @@ -92,7 +91,6 @@ function options_form_summary_options() { return $options; } - function render($row) { global $base_url; diff --git a/lib/Views/comment/Plugin/views/row/View.php b/lib/Views/comment/Plugin/views/row/View.php index df7f4d086cad..43d0ed62acd4 100644 --- a/lib/Views/comment/Plugin/views/row/View.php +++ b/lib/Views/comment/Plugin/views/row/View.php @@ -68,7 +68,6 @@ function options_form(&$form, &$form_state) { ); } - /** * Return the main options, which are shown in the summary title. */ diff --git a/lib/Views/field/Plugin/views/argument/FieldList.php b/lib/Views/field/Plugin/views/argument/FieldList.php index d232c8afbcc7..02b6c4d63b89 100644 --- a/lib/Views/field/Plugin/views/argument/FieldList.php +++ b/lib/Views/field/Plugin/views/argument/FieldList.php @@ -58,7 +58,6 @@ function options_form(&$form, &$form_state) { ); } - function summary_name($data) { $value = $data->{$this->name_alias}; // If the list element has a human readable name show it, diff --git a/lib/Views/field/Plugin/views/argument/ListString.php b/lib/Views/field/Plugin/views/argument/ListString.php index 883fb4b8940a..b9dd1b9476b0 100644 --- a/lib/Views/field/Plugin/views/argument/ListString.php +++ b/lib/Views/field/Plugin/views/argument/ListString.php @@ -10,7 +10,6 @@ use Drupal\views\Plugin\views\argument\String; use Drupal\Core\Annotation\Plugin; - /** * Argument handler for list field to show the human readable name in the * summary. diff --git a/lib/Views/file/Plugin/views/field/File.php b/lib/Views/file/Plugin/views/field/File.php index 1620fca2b89c..b9f6147cfe15 100644 --- a/lib/Views/file/Plugin/views/field/File.php +++ b/lib/Views/file/Plugin/views/field/File.php @@ -10,7 +10,6 @@ use Drupal\Core\Annotation\Plugin; use Drupal\views\Plugin\views\field\FieldPluginBase; - /** * Field handler to provide simple renderer that allows linking to a file. * diff --git a/lib/Views/node/Plugin/views/argument/UidRevision.php b/lib/Views/node/Plugin/views/argument/UidRevision.php index fa6387d46add..a51c91f767da 100644 --- a/lib/Views/node/Plugin/views/argument/UidRevision.php +++ b/lib/Views/node/Plugin/views/argument/UidRevision.php @@ -2,7 +2,7 @@ /** * @file - * Defintion of Views\node\Plugin\views\argument\UidRevision. + * Definition of Views\node\Plugin\views\argument\UidRevision. */ namespace Views\node\Plugin\views\argument; diff --git a/lib/Views/node/Plugin/views/field/Path.php b/lib/Views/node/Plugin/views/field/Path.php index 418623e7c62a..e22617939e83 100644 --- a/lib/Views/node/Plugin/views/field/Path.php +++ b/lib/Views/node/Plugin/views/field/Path.php @@ -2,7 +2,7 @@ /** * @file - * Defintion of Views\node\Plugin\views\field\Path. + * Definition of Views\node\Plugin\views\field\Path. */ namespace Views\node\Plugin\views\field; diff --git a/lib/Views/node/Plugin/views/row/Rss.php b/lib/Views/node/Plugin/views/row/Rss.php index 298a692f7762..b756c8fc77d6 100644 --- a/lib/Views/node/Plugin/views/row/Rss.php +++ b/lib/Views/node/Plugin/views/row/Rss.php @@ -2,7 +2,7 @@ /** * @file - * Contains the node RSS row style plugin. + * Definition of Views\node\Plugin\views\row\Rss. */ namespace Views\node\Plugin\views\row; @@ -82,7 +82,6 @@ function summary_title() { return check_plain($options[$this->options['item_length']]); } - function pre_render($values) { $nids = array(); foreach ($values as $row) { diff --git a/lib/Views/node/Plugin/views/wizard/Node.php b/lib/Views/node/Plugin/views/wizard/Node.php index dae9f7541c68..cb290ce5e7b8 100644 --- a/lib/Views/node/Plugin/views/wizard/Node.php +++ b/lib/Views/node/Plugin/views/wizard/Node.php @@ -71,7 +71,6 @@ public function getAvailableSorts() { ); } - protected function row_style_options($type) { $options = array(); $options['teasers'] = t('teasers'); @@ -179,7 +178,6 @@ protected function default_display_filters_user($form, $form_state) { return $filters; } - protected function page_display_options($form, $form_state) { $display_options = parent::page_display_options($form, $form_state); $row_plugin = isset($form_state['values']['page']['style']['row_plugin']) ? $form_state['values']['page']['style']['row_plugin'] : NULL; diff --git a/lib/Views/search/Plugin/views/filter/Search.php b/lib/Views/search/Plugin/views/filter/Search.php index ddf0ce9e4f5a..a0e5af854327 100644 --- a/lib/Views/search/Plugin/views/filter/Search.php +++ b/lib/Views/search/Plugin/views/filter/Search.php @@ -2,7 +2,7 @@ /** * @file - * Defintion of Views\search\Plugin\views\filter\Search. + * Definition of Views\search\Plugin\views\filter\Search. */ namespace Views\search\Plugin\views\filter; diff --git a/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php b/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php index 0222dc01e3bc..908655ded9e4 100644 --- a/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php +++ b/lib/Views/taxonomy/Plugin/views/argument_validator/Term.php @@ -5,7 +5,6 @@ * Definition of Views\taxonomy\Plugin\views\argument_validator\Term. */ - namespace Views\taxonomy\Plugin\views\argument_validator; use Drupal\Core\Annotation\Plugin; diff --git a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php index d0e777530dde..ebfd7f764cee 100644 --- a/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php +++ b/lib/Views/taxonomy/Plugin/views/field/Taxonomy.php @@ -5,7 +5,6 @@ * Definition of Views\taxonomy\Plugin\views\field\Taxonomy. */ - namespace Views\taxonomy\Plugin\views\field; use Drupal\views\Plugin\views\field\FieldPluginBase; diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php index 20d9ed75db39..03534308bc9f 100644 --- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php +++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php @@ -213,7 +213,6 @@ function value_form(&$form, &$form_state) { } } - if (empty($form_state['exposed'])) { // Retain the helper option $this->helper->options_form($form, $form_state); diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php index 17c14b1e6298..55dff0384986 100644 --- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php +++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php @@ -5,7 +5,6 @@ * Definition of Views\taxonomy\Plugin\views\filter\TaxonomyIndexTidDepth. */ - namespace Views\taxonomy\Plugin\views\filter; use Drupal\Core\Annotation\Plugin; diff --git a/lib/Views/user/Plugin/views/row/View.php b/lib/Views/user/Plugin/views/row/View.php index f692e13d1475..b5222d75d33c 100644 --- a/lib/Views/user/Plugin/views/row/View.php +++ b/lib/Views/user/Plugin/views/row/View.php @@ -2,7 +2,7 @@ /** * @file - * Defintion of Views\user\Plugin\views\row\View + * Definition of Views\user\Plugin\views\row\View */ namespace Views\user\Plugin\views\row; @@ -53,7 +53,6 @@ function options_form(&$form, &$form_state) { $form['help']['#markup'] = t("Display the user with standard user view. It might be necessary to add a user-profile.tpl.php in your themes template folder, because the default <a href=\"@user-profile-api-link\">user-profile</a>e template don't show the username per default.", array('@user-profile-api-link' => url('http://api.drupal.org/api/drupal/modules--user--user-profile.tpl.php/7'))); } - /** * Return the main options, which are shown in the summary title. */ diff --git a/modules/aggregator.views.inc b/modules/aggregator.views.inc index 7ad339424db7..2e128937a26c 100644 --- a/modules/aggregator.views.inc +++ b/modules/aggregator.views.inc @@ -167,7 +167,6 @@ function aggregator_views_data() { ), ); - // ---------------------------------------------------------------------- // Aggregator feed table diff --git a/modules/comment.views.inc b/modules/comment.views.inc index e95029850481..481873ae723e 100644 --- a/modules/comment.views.inc +++ b/modules/comment.views.inc @@ -164,7 +164,6 @@ function comment_views_data() { ), ); - // Langcode field if (module_exists('language')) { $data['comment']['language']['moved to'] = array('comment', 'langcode'); @@ -305,7 +304,6 @@ function comment_views_data() { ), ); - // link to approve comment $data['comment']['approve_comment'] = array( 'field' => array( diff --git a/modules/field.views.inc b/modules/field.views.inc index 1f2ed12700a7..d97806ab45ba 100644 --- a/modules/field.views.inc +++ b/modules/field.views.inc @@ -273,7 +273,6 @@ function field_views_field_default_views_data($field) { break; } - if (count($field['columns']) == 1 || $column == 'value') { $title = t('@label (!name)', array('@label' => $label, '!name' => $field['field_name'])); // CCK used the first 10 characters of $label. Probably doesn't matter. diff --git a/modules/node.views.inc b/modules/node.views.inc index e2a6dab41469..d95b8100359c 100644 --- a/modules/node.views.inc +++ b/modules/node.views.inc @@ -281,7 +281,6 @@ function node_views_data() { ), ); - // Bogus fields for aliasing purposes. $data['node']['created_fulldate'] = array( diff --git a/modules/statistics.views.inc b/modules/statistics.views.inc index 4bd0253f050f..cc193566ef4a 100644 --- a/modules/statistics.views.inc +++ b/modules/statistics.views.inc @@ -77,7 +77,6 @@ function statistics_views_data() { ), ); - // ---------------------------------------------------------------- // accesslog table @@ -258,6 +257,5 @@ function statistics_views_data() { ), ); - return $data; } diff --git a/modules/taxonomy.views.inc b/modules/taxonomy.views.inc index 8bb4a42ac33f..e97b89868507 100644 --- a/modules/taxonomy.views.inc +++ b/modules/taxonomy.views.inc @@ -116,8 +116,6 @@ function taxonomy_views_data() { ); $data['taxonomy_term_data']['table']['entity type'] = 'taxonomy_term'; - - // The term data table $data['taxonomy_term_data']['table']['join'] = array( 'taxonomy_vocabulary' => array( diff --git a/modules/translation.views.inc b/modules/translation.views.inc index 7f28fa50c8ad..6564b31829dc 100644 --- a/modules/translation.views.inc +++ b/modules/translation.views.inc @@ -117,5 +117,4 @@ function translation_views_data_alter(&$data) { ), ); - } diff --git a/modules/user.views.inc b/modules/user.views.inc index 4f399c0137b3..47f634552d37 100644 --- a/modules/user.views.inc +++ b/modules/user.views.inc @@ -26,7 +26,6 @@ function user_views_data() { ); $data['users']['table']['entity type'] = 'user'; - $data['users']['table']['default_relationship'] = array( 'node' => array( 'table' => 'node', diff --git a/plugins/export_ui/views_ui.class.php b/plugins/export_ui/views_ui.class.php index d504ae850eab..298bba4be3b7 100644 --- a/plugins/export_ui/views_ui.class.php +++ b/plugins/export_ui/views_ui.class.php @@ -193,7 +193,6 @@ function list_sort_options() { ); } - function list_build_row($view, &$form_state, $operations) { if (!empty($view->human_name)) { $title = $view->human_name; diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php index 877d0fd50abf..563b57237719 100644 --- a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php +++ b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/DynamicTest.php @@ -21,6 +21,7 @@ * ) */ class DynamicTest extends AccessPluginBase { + function option_definition() { $options = parent::option_definition(); $options['access'] = array('default' => FALSE, 'bool' => TRUE); @@ -35,4 +36,5 @@ function access($account) { function get_access_callback() { return array('views_test_test_dynamic_access_callback', array(!empty($options['access']), 1, 2)); } + } diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php index 4c89a6d7f2e5..7b5b424cd2e7 100644 --- a/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php +++ b/tests/views_test/lib/Drupal/views_test/Plugin/views/access/StaticTest.php @@ -21,6 +21,7 @@ * ) */ class StaticTest extends AccessPluginBase { + function option_definition() { $options = parent::option_definition(); $options['access'] = array('default' => FALSE, 'bool' => TRUE); @@ -35,4 +36,5 @@ function access($account) { function get_access_callback() { return array('views_test_test_static_access_callback', array(!empty($options['access']))); } + } diff --git a/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php b/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php index 2683781fa57d..1cdb9fafb6ac 100644 --- a/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php +++ b/tests/views_test/lib/Drupal/views_test/Plugin/views/localization/LocalizationTest.php @@ -22,6 +22,7 @@ * ) */ class LocalizationTest extends LocalizationPluginBase { + /** * Store the strings which was translated. */ @@ -50,4 +51,5 @@ function export($source) { function get_export_strings() { return $this->export_strings; } + } diff --git a/theme/theme.inc b/theme/theme.inc index 42d2b7bbf597..1a5eb0ba672a 100644 --- a/theme/theme.inc +++ b/theme/theme.inc @@ -639,7 +639,6 @@ function template_preprocess_views_view_table(&$vars) { $vars['field_classes'][0][0] = 'views-empty'; } - if (!empty($options['sticky'])) { drupal_add_js('misc/tableheader.js'); $vars['attributes']['class'][] = "sticky-enabled"; @@ -1030,8 +1029,6 @@ function theme_views_mini_pager($vars) { $pager_max = $pager_total[$element]; // End of marker calculations. - - if ($pager_total[$element] > 1) { $li_previous = theme('pager_previous', diff --git a/views.api.php b/views.api.php index a8d04a1da97a..0b5b52a8eb03 100644 --- a/views.api.php +++ b/views.api.php @@ -506,7 +506,6 @@ function hook_views_data_alter(&$data) { // Note that the $data array is not returned – it is modified by reference. } - /** * Describes plugins defined by the module. * diff --git a/views.module b/views.module index 39a1ada4bb69..bf1b1e53ad10 100644 --- a/views.module +++ b/views.module @@ -1472,7 +1472,6 @@ function views_get_enabled_display_extenders() { return array_filter($enabled); } - // ----------------------------------------------------------------------- // Views database functions @@ -2108,7 +2107,6 @@ function views_exposed_form_submit(&$form, &$form_state) { $form_state['view']->exposed_data = $form_state['values']; $form_state['view']->exposed_raw_input = array(); - $exclude = array('submit', 'form_build_id', 'form_id', 'form_token', 'exposed_form_plugin', '', 'reset'); $exposed_form_plugin = $form_state['exposed_form_plugin']; $exposed_form_plugin->exposed_form_submit($form, $form_state, $exclude); diff --git a/views_ui.module b/views_ui.module index 5d99748b11fc..823d8ff1ffc3 100644 --- a/views_ui.module +++ b/views_ui.module @@ -230,7 +230,6 @@ function views_ui_theme() { 'file' => 'includes/admin.inc', ), - // On behalf of a plugin 'views_ui_style_plugin_table' => array( 'render element' => 'form', @@ -350,7 +349,6 @@ function views_ui_cache_set(&$view) { views_temp_store()->set($view->name, $view); } - /** * Specialized menu callback to load a view that is only a default * view. @@ -534,7 +532,6 @@ function views_ui_view_preview_section_rows_links($view) { return $links; } - /** * Implments hook_ctools_plugin_directory(). * @@ -752,7 +749,6 @@ function views_ui_ajax_get_form($form_id) { } // @todo move these when we can - /** * Helper function to get a list of paths assigned to a view. * -- GitLab