vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-07 06:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code Modernization: Replace dirname( __FILE__ ) calls with __DIR__ magic constant.

Browse Source 
This avoids the performance overhead of the function call every time `dirname( __FILE__ )` was used instead of `__DIR__`.

This commit also includes:

* Removing unnecessary parentheses from `include`/`require` statements. These are language constructs, not function calls.
* Replacing `include` statements for several files with `require_once`, for consistency:
 * `wp-admin/admin-header.php`
 * `wp-admin/admin-footer.php`
 * `wp-includes/version.php`

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.

git-svn-id: https://develop.svn.wordpress.org/trunk@47198 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-02-06 06:31:22 +00:00
parent b02e49c2e8
commit e72fff9cef
304 changed files with 1068 additions and 1063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-admin/widgets.php
View File

@@ -7,10 +7,10 @@
*/
/** WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
require_once __DIR__ . '/admin.php';
/** WordPress Administration Widgets API */
require_once( ABSPATH . 'wp-admin/includes/widgets.php' );
require_once ABSPATH . 'wp-admin/includes/widgets.php';
if ( ! current_user_can( 'edit_theme_options' ) ) {
wp_die(
@@ -288,7 +288,7 @@ if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {
$width = ' style="width:' . max( $control['width'], 350 ) . 'px"';
$key = isset( $_GET['key'] ) ? (int) $_GET['key'] : 0;
require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
<div class="wrap">
<h1><?php echo esc_html( $title ); ?></h1>
<div class="editwidget"<?php echo $width; ?>>
@@ -366,7 +366,7 @@ if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {
</div>
</div>
<?php
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';
exit;
}
@@ -379,7 +379,7 @@ $errors = array(
__( 'Error in displaying the widget settings form.' ),
);
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
?>
<div class="wrap">
@@ -575,4 +575,4 @@ foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
* @since 2.2.0
*/
do_action( 'sidebar_admin_page' );
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';