Changeset 31090 for trunk/src/wp-admin/includes/class-wp-upgrader-skins.php

Timestamp:

01/08/2015 07:04:40 AM (12 years ago)

Author:

wonderboymusic

Message:

The keyword elseif should be used instead of else if so that all control keywords look like single words.

This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.

See #30799.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader-skins.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -448 +448 @@
                 }
 
-                if ( 'import' == $from )
+                if ( 'import' == $from ) {
                         $install_actions['importers_page'] = '<a href="' . admin_url('import.php') . '" title="' . esc_attr__('Return to Importers') . '" target="_parent">' . __('Return to Importers') . '</a>';
-                else if ( $this->type == 'web' )
+                } elseif ( $this->type == 'web' ) {
                         $install_actions['plugins_page'] = '<a href="' . self_admin_url('plugin-install.php') . '" title="' . esc_attr__('Return to Plugin Installer') . '" target="_parent">' . __('Return to Plugin Installer') . '</a>';
-                else
+                } else {
                         $install_actions['plugins_page'] = '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>';
+                }
 
                 if ( ! $this->result || is_wp_error($this->result) ) {
@@ -732 +733 @@
          */
         public function feedback( $data ) {
-                if ( is_wp_error( $data ) )
+                if ( is_wp_error( $data ) ) {
                         $string = $data->get_error_message();
-                else if ( is_array( $data ) )
-                        return;
-                else
+                } elseif ( is_array( $data ) ) {
+                        return;
+                } else {
                         $string = $data;
-
+                }
                 if ( ! empty( $this->upgrader->strings[ $string ] ) )
                         $string = $this->upgrader->strings[ $string ];