updated contrib modules

sites/all/modules/views/includes/plugins.inc

@@ -5,7 +5,7 @@
  * Built in plugins for Views output handling.
  */
 
-// @todo: Remove this once update.php can use the registry
+// @todo Remove this once update.php can use the registry.
 views_include('base');
 
 /**
@@ -101,7 +101,7 @@ function views_views_plugins() {
         'title' => t('Empty display extender'),
         'help' => t('Default settings for this view.'),
         'handler' => 'views_plugin_display_extender',
-        // You can force the plugin to be enabled
+        // You can force the plugin to be enabled.
         'enabled' => FALSE,
         'no ui' => TRUE,
       ),
@@ -160,7 +160,8 @@ function views_views_plugins() {
         'help' => t('Displays the default summary as a list.'),
         'handler' => 'views_plugin_style_summary',
         'theme' => 'views_view_summary',
-        'type' => 'summary', // only shows up as a summary style
+        'type' => 'summary',
+  // only shows up as a summary style.
         'uses options' => TRUE,
         'help topic' => 'style-summary',
       ),
@@ -169,7 +170,8 @@ function views_views_plugins() {
         'help' => t('Displays the summary unformatted, with option for one after another or inline.'),
         'handler' => 'views_plugin_style_summary_unformatted',
         'theme' => 'views_view_summary_unformatted',
-        'type' => 'summary', // only shows up as a summary style
+        'type' => 'summary',
+  // only shows up as a summary style.
         'uses options' => TRUE,
         'help topic' => 'style-summary-unformatted',
       ),
@@ -266,7 +268,7 @@ function views_views_plugins() {
       'views_query' => array(
         'title' => t('SQL Query'),
         'help' => t('Query will be generated and run using the Drupal database API.'),
-        'handler' => 'views_plugin_query_default'
+        'handler' => 'views_plugin_query_default',
       ),
     ),
     'cache' => array(
@@ -356,7 +358,7 @@ function views_views_plugins() {
         'handler' => 'views_plugin_localization',
         'parent' => '',
       ),
-     'none' => array(
+      'none' => array(
         'title' => t('None'),
         'help' => t('Do not pass admin strings for translation.'),
         'handler' => 'views_plugin_localization_none',
@@ -381,7 +383,8 @@ function views_views_plugins() {
       'help' => t('Puts all of the results into a select box and allows the user to go to a different page based upon the results.'),
       'handler' => 'views_plugin_style_summary_jump_menu',
       'theme' => 'views_view_summary_jump_menu',
-      'type' => 'summary', // only shows up as a summary style
+      'type' => 'summary',
+    // only shows up as a summary style.
       'uses options' => TRUE,
       'help topic' => 'style-summary-jump-menu',
     );
@@ -417,7 +420,7 @@ function views_discover_plugins() {
     }
 
     $module_dir = isset($result['module']) ? $result['module'] : $module;
-    // Setup automatic path/file finding for theme registration
+    // Setup automatic path/file finding for theme registration.
     if ($module_dir == 'views') {
       $theme_path = drupal_get_path('module', $module_dir) . '/theme';
       $theme_file = 'theme.inc';
@@ -452,7 +455,7 @@ function views_discover_plugins() {
         // Set the internal name to be able to read it out later.
         $def['name'] = $plugin;
 
-        // merge the new data in
+        // merge the new data in.
         $cache[$type][$plugin] = $def;
       }
     }
@@ -467,29 +470,30 @@ function views_discover_plugins() {
  * Abstract base class to provide interface common to all plugins.
  */
 class views_plugin extends views_object {
+
   /**
    * The top object of a view.
    *
    * @var view
    */
-  var $view = NULL;
+  public $view = NULL;
 
   /**
    * The current used views display.
    *
    * @var views_display
    */
-  var $display = NULL;
+  public $display = NULL;
 
   /**
    * The plugin type of this plugin, for example style or query.
    */
-  var $plugin_type = NULL;
+  public $plugin_type = NULL;
 
   /**
    * The plugin name of this plugin, for example table or full.
    */
-  var $plugin_name = NULL;
+  public $plugin_name = NULL;
 
   /**
    * Init will be called after construct, when the plugin is attached to a
@@ -499,7 +503,7 @@ class views_plugin extends views_object {
   /**
    * Provide a form to edit options for this plugin.
    */
-  function options_form(&$form, &$form_state) {
+  public function options_form(&$form, &$form_state) {
     // Some form elements belong in a fieldset for presentation, but can't
     // be moved into one because of the form_state['values'] hierarchy. Those
     // elements can add a #fieldset => 'fieldset_name' property, and they'll
@@ -510,22 +514,25 @@ class views_plugin extends views_object {
   /**
    * Validate the options form.
    */
-  function options_validate(&$form, &$form_state) { }
+  public function options_validate(&$form, &$form_state) {
+  }
 
   /**
    * Handle any special handling on the validate form.
    */
-  function options_submit(&$form, &$form_state) { }
+  public function options_submit(&$form, &$form_state) {
+  }
 
   /**
    * Add anything to the query that we might need to.
    */
-  function query() { }
+  public function query() {
+  }
 
   /**
    * Provide a full list of possible theme templates used by this style.
    */
-  function theme_functions() {
+  public function theme_functions() {
     if (empty($this->definition['theme'])) {
       $this->definition['theme'] = 'views_view';
     }
@@ -533,9 +540,9 @@ class views_plugin extends views_object {
   }
 
   /**
-   * Provide a list of additional theme functions for the theme information page
+   * Provide a list of additional theme functions for the theme info page.
    */
-  function additional_theme_functions() {
+  public function additional_theme_functions() {
     $funcs = array();
     if (!empty($this->definition['additional themes'])) {
       foreach ($this->definition['additional themes'] as $theme => $type) {
@@ -548,16 +555,18 @@ class views_plugin extends views_object {
   /**
    * Validate that the plugin is correct and can be saved.
    *
-   * @return
+   * @return array
    *   An array of error strings to tell the user what is wrong with this
    *   plugin.
    */
-  function validate() { return array(); }
+  public function validate() {
+    return array();
+  }
 
   /**
    * Returns the summary of the settings in the display.
    */
-  function summary_title() {
+  public function summary_title() {
     return t('Settings');
   }
   /**
@@ -565,12 +574,13 @@ class views_plugin extends views_object {
    *
    * This appears on the ui beside each plugin and beside the settings link.
    */
-  function plugin_title() {
+  public function plugin_title() {
     if (isset($this->definition['short title'])) {
       return check_plain($this->definition['short title']);
     }
     return check_plain($this->definition['title']);
   }
+
 }
 
 /**