Changeset 48764
- Timestamp:
- 08/08/2020 09:02:18 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/plugin.php
r48762 r48764 652 652 } 653 653 654 if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current, true ) ) ) { 654 if ( $network_wide && ! isset( $current[ $plugin ] ) 655 || ! $network_wide && ! in_array( $plugin, $current, true ) 656 ) { 655 657 if ( ! empty( $redirect ) ) { 656 658 // We'll override this later if the plugin can be included without fatal error. … … 765 767 } 766 768 767 $network_deactivating = false !== $network_wide&& is_plugin_active_for_network( $plugin );769 $network_deactivating = ( false !== $network_wide ) && is_plugin_active_for_network( $plugin ); 768 770 769 771 if ( ! $silent ) { … … 979 981 // If plugin is in its own directory, recursively delete the directory. 980 982 // Base check on if plugin includes directory separator AND that it's not the root plugin folder. 981 if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) {983 if ( strpos( $plugin_file, '/' ) && $this_plugin_dir !== $plugins_dir ) { 982 984 $deleted = $wp_filesystem->delete( $this_plugin_dir, true ); 983 985 } else { … … 1151 1153 $compatible_php = is_php_version_compatible( $requirements['requires_php'] ); 1152 1154 1153 /* translators: %s: URL to Update PHP page. */1154 1155 $php_update_message = '</p><p>' . sprintf( 1156 /* translators: %s: URL to Update PHP page. */ 1155 1157 __( '<a href="%s">Learn more about updating PHP</a>.' ), 1156 1158 esc_url( wp_get_update_php_url() ) … … 1415 1417 * this case, don't automatically add a link back to avoid duplication. 1416 1418 */ 1417 if ( ! isset( $submenu[ $parent_slug ] ) && $menu_slug != $parent_slug ) {1419 if ( ! isset( $submenu[ $parent_slug ] ) && $menu_slug !== $parent_slug ) { 1418 1420 foreach ( (array) $menu as $parent_menu ) { 1419 if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) ) {1421 if ( $parent_menu[2] === $parent_slug && current_user_can( $parent_menu[1] ) ) { 1420 1422 $submenu[ $parent_slug ][] = array_slice( $parent_menu, 0, 4 ); 1421 1423 } … … 1768 1770 1769 1771 foreach ( $menu as $i => $item ) { 1770 if ( $menu_slug == $item[2] ) {1772 if ( $menu_slug === $item[2] ) { 1771 1773 unset( $menu[ $i ] ); 1772 1774 return $item; … … 1796 1798 1797 1799 foreach ( $submenu[ $menu_slug ] as $i => $item ) { 1798 if ( $submenu_slug == $item[2] ) {1800 if ( $submenu_slug === $item[2] ) { 1799 1801 unset( $submenu[ $menu_slug ][ $i ] ); 1800 1802 return $item; … … 1823 1825 if ( isset( $_parent_pages[ $menu_slug ] ) ) { 1824 1826 $parent_slug = $_parent_pages[ $menu_slug ]; 1827 1825 1828 if ( $parent_slug && ! isset( $_parent_pages[ $parent_slug ] ) ) { 1826 1829 $url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) ); … … 1871 1874 $parent = $_wp_real_parent_file[ $parent ]; 1872 1875 } 1876 1873 1877 return $parent; 1874 1878 } … … 1876 1880 if ( 'admin.php' === $pagenow && isset( $plugin_page ) ) { 1877 1881 foreach ( (array) $menu as $parent_menu ) { 1878 if ( $parent_menu[2] == $plugin_page ) {1882 if ( $parent_menu[2] === $plugin_page ) { 1879 1883 $parent_file = $plugin_page; 1884 1880 1885 if ( isset( $_wp_real_parent_file[ $parent_file ] ) ) { 1881 1886 $parent_file = $_wp_real_parent_file[ $parent_file ]; 1882 1887 } 1888 1883 1889 return $parent_file; 1884 1890 } … … 1886 1892 if ( isset( $_wp_menu_nopriv[ $plugin_page ] ) ) { 1887 1893 $parent_file = $plugin_page; 1894 1888 1895 if ( isset( $_wp_real_parent_file[ $parent_file ] ) ) { 1889 1896 $parent_file = $_wp_real_parent_file[ $parent_file ]; 1890 1897 } 1898 1891 1899 return $parent_file; 1892 1900 } … … 1895 1903 if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $pagenow ][ $plugin_page ] ) ) { 1896 1904 $parent_file = $pagenow; 1905 1897 1906 if ( isset( $_wp_real_parent_file[ $parent_file ] ) ) { 1898 1907 $parent_file = $_wp_real_parent_file[ $parent_file ]; 1899 1908 } 1909 1900 1910 return $parent_file; 1901 1911 } … … 1906 1916 $parent = $_wp_real_parent_file[ $parent ]; 1907 1917 } 1908 if ( ! empty( $typenow ) && ( "$pagenow?post_type=$typenow" === $submenu_array[2] ) ) { 1918 1919 if ( ! empty( $typenow ) && "$pagenow?post_type=$typenow" === $submenu_array[2] ) { 1909 1920 $parent_file = $parent; 1910 1921 return $parent; 1911 } elseif ( $submenu_array[2] == $pagenow && empty( $typenow ) && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) ) ) { 1922 } elseif ( empty( $typenow ) && $pagenow === $submenu_array[2] 1923 && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) ) 1924 ) { 1912 1925 $parent_file = $parent; 1913 1926 return $parent; 1914 } elseif ( isset( $plugin_page ) && ( $plugin_page == $submenu_array[2] )) {1927 } elseif ( isset( $plugin_page ) && $plugin_page === $submenu_array[2] ) { 1915 1928 $parent_file = $parent; 1916 1929 return $parent; … … 1954 1967 foreach ( (array) $menu as $menu_array ) { 1955 1968 if ( isset( $menu_array[3] ) ) { 1956 if ( $menu_array[2] == $pagenow ) {1969 if ( $menu_array[2] === $pagenow ) { 1957 1970 $title = $menu_array[3]; 1958 1971 return $menu_array[3]; 1959 } elseif ( isset( $plugin_page ) && ( $plugin_page == $menu_array[2] ) && ( $hook == $menu_array[5] )) {1972 } elseif ( isset( $plugin_page ) && $plugin_page === $menu_array[2] && $hook === $menu_array[5] ) { 1960 1973 $title = $menu_array[3]; 1961 1974 return $menu_array[3]; … … 1969 1982 foreach ( array_keys( $submenu ) as $parent ) { 1970 1983 foreach ( $submenu[ $parent ] as $submenu_array ) { 1971 if ( isset( $plugin_page ) && 1972 ( $plugin_page == $submenu_array[2] ) && 1973 ( 1974 ( $parent == $pagenow ) || 1975 ( $parent == $plugin_page ) || 1976 ( $plugin_page == $hook ) || 1977 ( 'admin.php' === $pagenow && $parent1 != $submenu_array[2] ) || 1978 ( ! empty( $typenow ) && $parent == $pagenow . '?post_type=' . $typenow ) 1979 ) 1984 if ( isset( $plugin_page ) 1985 && ( $plugin_page === $submenu_array[2] ) 1986 && ( $pagenow === $parent 1987 || $plugin_page === $parent 1988 || $plugin_page === $hook 1989 || 'admin.php' === $pagenow && $parent1 !== $submenu_array[2] 1990 || ! empty( $typenow ) && "$pagenow?post_type=$typenow" === $parent ) 1980 1991 ) { 1981 1992 $title = $submenu_array[3]; … … 1983 1994 } 1984 1995 1985 if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) { // Not the current page.1996 if ( $submenu_array[2] !== $pagenow || isset( $_GET['page'] ) ) { // Not the current page. 1986 1997 continue; 1987 1998 } … … 1998 2009 if ( empty( $title ) ) { 1999 2010 foreach ( $menu as $menu_array ) { 2000 if ( isset( $plugin_page ) && 2001 ( $plugin_page == $menu_array[2] ) && 2002 ( 'admin.php' === $pagenow ) && 2003 ( $parent1 == $menu_array[2] ) ) { 2011 if ( isset( $plugin_page ) 2012 && $plugin_page === $menu_array[2] 2013 && 'admin.php' === $pagenow 2014 && $parent1 === $menu_array[2] 2015 ) { 2004 2016 $title = $menu_array[3]; 2005 2017 return $menu_array[3]; … … 2127 2139 } 2128 2140 2129 if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {2141 if ( isset( $plugin_page ) && ( $plugin_page === $parent ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) { 2130 2142 return false; 2131 2143 } … … 2133 2145 if ( isset( $submenu[ $parent ] ) ) { 2134 2146 foreach ( $submenu[ $parent ] as $submenu_array ) { 2135 if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {2147 if ( isset( $plugin_page ) && ( $submenu_array[2] === $plugin_page ) ) { 2136 2148 return current_user_can( $submenu_array[1] ); 2137 } elseif ( $submenu_array[2] == $pagenow ) {2149 } elseif ( $submenu_array[2] === $pagenow ) { 2138 2150 return current_user_can( $submenu_array[1] ); 2139 2151 } … … 2142 2154 2143 2155 foreach ( $menu as $menu_array ) { 2144 if ( $menu_array[2] == $parent ) {2156 if ( $menu_array[2] === $parent ) { 2145 2157 return current_user_can( $menu_array[1] ); 2146 2158 }
Note: See TracChangeset
for help on using the changeset viewer.