Changeset 2237

Timestamp:

12/29/2015 08:34:42 PM (10 years ago)

Author:

ocean90

Message:

Rosetta Roles: Remove unused $wpdb global imports.

Also fixes some code style issues.

See #1240.

Location:

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles

Files:

• class-translation-editors-list-table.php (modified) (4 diffs)
• js/rosetta-roles.js (modified) (4 diffs)
• rosetta-roles.php (modified) (9 diffs)
• views/edit-translation-editor.php (modified) (1 diff)

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/class-translation-editors-list-table.php

@@ -48 +48 @@
      */
     public function __construct( $args = array() ) {
-        global $wpdb;
-
         parent::__construct( array(
             'singular' => 'translation-editor',
@@ -67 +65 @@
      */
     public function prepare_items() {
-        $search =   isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+        $search   = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
         $per_page = $this->get_items_per_page( 'translation_editors_per_page', 10 );
-        $paged =    $this->get_pagenum();
+        $paged    = $this->get_pagenum();
 
         $role__in = $this->user_roles;
@@ -81 +79 @@
             'role__in' => $role__in,
             'search'   => $search,
-            'fields'   => 'all_with_meta'
+            'fields'   => 'all_with_meta',
         );
 
@@ -226 +224 @@
         $class_html = '';
         if ( ! empty( $class ) ) {
-             $class_html = sprintf(
+            $class_html = sprintf(
                 ' class="%s"',
                 esc_attr( $class )

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/js/rosetta-roles.js

@@ -244 +244 @@
         updateIsActive: function() {
             this.model.set( 'isActive', true );
-        },
+        }
     });
 
@@ -263 +263 @@
                 collection: collection
             }) );
-        },
+        }
     });
 
@@ -306 +306 @@
         attributes: {
             placeholder: l10n.searchPlaceholder,
-            type: 'search',
+            type: 'search'
         },
 
@@ -312 +312 @@
             'input': 'search',
             'keyup': 'search',
-            'keydown': 'search',
+            'keydown': 'search'
         },
 

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/rosetta-roles.php

@@ -125 +125 @@
      * The list used in wp_dropdown_roles() on users list table.
      *
-     * @param array $all_roles List of roles.
+     * @param array $roles List of roles.
      * @return array Filtered list of editable roles.
      */
@@ -233 +233 @@
         $args   = array(
             'default' => 10,
-            'option'  => 'translation_editors_per_page'
+            'option'  => 'translation_editors_per_page',
         );
         add_screen_option( $option, $args );
@@ -285 +285 @@
      */
     private function load_translation_editors() {
-        global $wpdb;
-
         $list_table = $this->get_translation_editors_list_table();
         $action = $list_table->current_action();
@@ -395 +393 @@
      */
     private function load_edit_translation_editor( $user_id ) {
-        global $wpdb;
-
         $redirect = menu_page_url( 'translation-editors', false );
 
@@ -623 +619 @@
      */
     private function render_edit_translation_editor( $user_id ) {
-        global $wpdb;
-
         $projects = $this->get_translate_projects();
         $project_tree = $this->get_project_tree( $projects, 0, 1 );
@@ -642 +636 @@
         wp_localize_script( 'rosetta-roles', '_rosettaProjectsSettings', array(
             'l10n' => array(
-                'searchPlaceholder' => esc_attr__( 'Search...', 'rosetta' )
+                'searchPlaceholder' => esc_attr__( 'Search...', 'rosetta' ),
             ),
             'data' => $project_tree,
-            'accessList' => $project_access_list
+            'accessList' => $project_access_list,
         ) );
 
@@ -689 +683 @@
                 $messages['error'][ $_REQUEST['error'] ]
             );
-        } elseif( isset( $_REQUEST['update'], $messages['update'][ $_REQUEST['update'] ] ) ) {
+        } elseif ( isset( $_REQUEST['update'], $messages['update'][ $_REQUEST['update'] ] ) ) {
             $message = sprintf(
                 '<div class="notice notice-success"><p>%s</p></div>',
@@ -705 +699 @@
      */
     private function get_translation_editors_list_table() {
-        global $wpdb;
         static $list_table;
 
@@ -742 +735 @@
                 'user_id'     => $user_id,
                 'association' => 'translation-editor',
-            )
+            ),
         );
 

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/views/edit-translation-editor.php

@@ -18 +18 @@
                                 <li id="project-all" class="active">
                                     <label>
-                                        <input name="projects[]"value="all" type="checkbox"<?php checked( in_array( 'all', $project_access_list ) ); ?>> <?php _e( 'All projects', 'rosetta' ); ?>
+                                        <input name="projects[]" value="all" type="checkbox"<?php checked( in_array( 'all', $project_access_list ) ); ?>> <?php _e( 'All projects', 'rosetta' ); ?>
                                     </label>
                                     <div class="sub-projects-wrapper">