WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `require_once()` to prevent a fatal error if `_wp_admin_bar_init()` is called twice. 

props danielbachhuber.
fixes #31287.
Built from https://develop.svn.wordpress.org/trunk@31411


git-svn-id: http://core.svn.wordpress.org/trunk@31392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-02-11 15:59:26 +00:00
parent daf711a338
commit 491ecc4c1c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/admin-bar.php
View File

@ -22,7 +22,7 @@ function _wp_admin_bar_init() {
return false; return false;
/* Load the admin bar class code ready for instantiation */ /* Load the admin bar class code ready for instantiation */
require( ABSPATH . WPINC . '/class-wp-admin-bar.php' ); require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
/* Instantiate the admin bar */ /* Instantiate the admin bar */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31409'; $wp_version = '4.2-alpha-31411';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.