--- wp-includes/class-simplepie.php (revision 13591)
+++ wp-includes/class-simplepie.php (working copy)
@@ -4067,16 +4067,16 @@
if (sizeof($temp) > 0)
{
- (int) $seconds = array_pop($temp);
+ $seconds = (int)array_pop($temp);
}
if (sizeof($temp) > 0)
{
- (int) $minutes = array_pop($temp);
+ $minutes = (int)array_pop($temp);
$seconds += $minutes * 60;
}
if (sizeof($temp) > 0)
{
- (int) $hours = array_pop($temp);
+ $hours = (int)array_pop($temp);
--- wp-includes/wp-diff.php (revision 13591)
+++ wp-includes/wp-diff.php (working copy)
@@ -8,14 +8,12 @@
* @subpackage Diff
*/
-if ( !class_exists( 'Text_Diff' ) ) {
//
- require( dirname(__FILE__).'/Text/Diff.php' );
+ require 'Text/Diff.php';
//
- require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
+ require 'Text/Diff/Renderer.php';
//
- require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
-}
+ require 'Text/Diff/Renderer/inline.php';
--- wp-includes/functions.php (revision 13591)
+++ wp-includes/functions.php (working copy)
@@ -2958,9 +2958,6 @@
*/
function require_wp_db() {
global $wpdb;
- if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
- require_once( WP_CONTENT_DIR . '/db.php' );
- else
require_once( ABSPATH . WPINC . '/wp-db.php' );
}
--- wp-includes/capabilities.php (revision 13591)
+++ wp-includes/capabilities.php (working copy)
@@ -770,7 +770,7 @@
global $wpdb;
if ( !empty($blog_id) ) {
$cap_key = $wpdb->get_blog_prefix( $blog_id );
- $cap_key. 'capabilities';
+ $cap_key.= 'capabilities';
} else {
$cap_key = '';
}
--- wp-includes/widgets.php (revision 13591)
+++ wp-includes/widgets.php (working copy)
@@ -848,6 +848,7 @@
}
$sidebars_widgets = wp_get_sidebars_widgets();
+ if(!count($sidebars_widgets)) return false;
--- wp-admin/includes/class-ftp.php (revision 13591)
+++ wp-admin/includes/class-ftp.php (working copy)
@@ -902,5 +902,5 @@
if(!@dl($prefix . 'sockets.' . PHP_SHLIB_SUFFIX)) $mod_sockets=FALSE;
}
-require_once "class-ftp-".($mod_sockets?"sockets":"pure").".php";
+require_once "class-ftp-sockets.php";
--- wp-admin/includes/user.php (revision 13591)
+++ wp-admin/includes/user.php (working copy)
@@ -832,7 +832,7 @@
}
add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
-function default_password_nag_edit_user($user_ID, $old_data) {
+function default_password_nag_edit_user($xuser_ID, $old_data) {
global $user_ID;
if ( ! get_user_option('default_password_nag') ) //Short circuit it.
--- wp-admin/import/blogger.php (revision 13591)
+++ wp-admin/import/blogger.php (working copy)
@@ -162,7 +162,7 @@
if ( $tag['tag'] == 'TITLE' ) {
$blog['title'] = $tag['value'];
} elseif ( $tag['tag'] == 'SUMMARY' ) {
- $blog['summary'] == $tag['value'];
+ $blog['summary'] = $tag['value'];