Changeset 31091

Timestamp:

01/08/2015 07:12:42 AM (10 years ago)

Author:

wonderboymusic

Message:

In wp-includes/plugin.php, collapse 3 else-newline-tab-if statements.

See #30799.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (3 diffs)

trunk/src/wp-admin/includes/plugin.php

@@ -1543 +1543 @@
                 $parent_file = $parent;
                 return $parent;
-            } else
-                if ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
-                    $parent_file = $parent;
-                    return $parent;
-                }
+            } elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
+                $parent_file = $parent;
+                return $parent;
+            }
         }
     }
@@ -1577 +1576 @@
                     $title = $menu_array[3];
                     return $menu_array[3];
-                } else
-                    if ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
-                        $title = $menu_array[3];
-                        return $menu_array[3];
-                    }
+                } elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
+                    $title = $menu_array[3];
+                    return $menu_array[3];
+                }
             } else {
                 $title = $menu_array[0];
@@ -1648 +1646 @@
     $page_type = 'admin';
     if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) {
-        if ( isset( $admin_page_hooks[$plugin_page] ) )
+        if ( isset( $admin_page_hooks[$plugin_page] ) ) {
             $page_type = 'toplevel';
-        else
-            if ( isset( $admin_page_hooks[$parent] ))
-                $page_type = $admin_page_hooks[$parent];
+        } elseif ( isset( $admin_page_hooks[$parent] )) {
+            $page_type = $admin_page_hooks[$parent];
+        }
     } elseif ( isset( $admin_page_hooks[$parent] ) ) {
         $page_type = $admin_page_hooks[$parent];