Index: /trunk/wp-admin/async-upload.php
===================================================================
--- /trunk/wp-admin/async-upload.php (revision 11012)
+++ /trunk/wp-admin/async-upload.php (revision 11013)
@@ -6,6 +6,6 @@
* @subpackage Administration
*/
-
-define('WP_ADMIN', true);
+
+define('WP_ADMIN', true);
if ( defined('ABSPATH') )
Index: /trunk/wp-admin/custom-header.php
===================================================================
--- /trunk/wp-admin/custom-header.php (revision 11012)
+++ /trunk/wp-admin/custom-header.php (revision 11013)
@@ -233,5 +233,5 @@
var ximg = jQuery('#upload').width();
var yimg = jQuery('#upload').height();
-
+
//set up default values
jQuery( '#x1' ).val(0);
@@ -241,5 +241,5 @@
jQuery( '#width' ).val(xinit);
jQuery( '#height' ).val(yinit);
-
+
if ( yimg < yinit || ximg < xinit ) {
if ( ximg / yimg > ratio ) {
Index: /trunk/wp-admin/gears-manifest.php
===================================================================
--- /trunk/wp-admin/gears-manifest.php (revision 11012)
+++ /trunk/wp-admin/gears-manifest.php (revision 11013)
@@ -7,7 +7,7 @@
*/
-/**
+/**
* Disable error reporting
- *
+ *
* Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
*/
Index: /trunk/wp-admin/includes/class-wp-upgrader.php
===================================================================
--- /trunk/wp-admin/includes/class-wp-upgrader.php (revision 11012)
+++ /trunk/wp-admin/includes/class-wp-upgrader.php (revision 11013)
@@ -20,5 +20,5 @@
var $skin = null;
var $result = array();
-
+
function WP_Upgrader(&$skin = null) {
return __construct($skin);
@@ -31,5 +31,5 @@
$this->skin->set_upgrader($this);
}
-
+
function generic_strings() {
$this->strings['bad_request'] = __('Invalid Data provided.');
@@ -47,15 +47,15 @@
$this->strings['mkdir_failed'] = __('Could not create directory.');
$this->strings['bad_package'] = __('Incompatible Archive');
-
+
$this->strings['maintenance_start'] = __('Enabling Maintenance mode.');
$this->strings['maintenance_end'] = __('Disabling Maintenance mode.');
}
-
+
function fs_connect( $directories = array() ) {
global $wp_filesystem;
-
+
if ( false === ($credentials = $this->skin->request_filesystem_credentials()) )
return false;
-
+
if ( ! WP_Filesystem($credentials) ) {
$error = true;
@@ -68,5 +68,5 @@
if ( ! is_object($wp_filesystem) )
return new WP_Error('fs_unavailable', $this->strings['fs_unavailable'] );
-
+
if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
return new WP_Error('fs_error', $this->strings['fs_error'], $wp_filesystem->errors);
@@ -95,5 +95,5 @@
if ( ! preg_match('!^(http|https|ftp)://!i', $package) && file_exists($package) ) //Local file or remote?
return $package; //must be a local file..
-
+
if ( empty($package) )
return new WP_Error('no_package', $this->strings['no_package']);
@@ -102,14 +102,14 @@
$download_file = download_url($package);
-
+
if ( is_wp_error($download_file) )
return new WP_Error('download_failed', $this->strings['download_failed'], $download_file->get_error_message());
-
+
return $download_file;
}
-
+
function unpack_package($package, $delete_package = true) {
global $wp_filesystem;
-
+
$this->skin->feedback('unpack_package');
@@ -141,8 +141,8 @@
return $result;
}
-
+
return $working_dir;
}
-
+
function install_package($args = array()) {
global $wp_filesystem;
@@ -158,5 +158,5 @@
if ( empty($source) || empty($destination) )
return new WP_Error('bad_request', $this->strings['bad_request']);
-
+
$this->skin->feedback('installing_package');
@@ -168,5 +168,5 @@
$remote_source = $source;
$local_destination = $destination;
-
+
$source_files = array_keys( $wp_filesystem->dirlist($remote_source) );
$remote_destination = $wp_filesystem->find_folder($local_destination);
@@ -178,14 +178,14 @@
return new WP_Error('bad_package', $this->strings['bad_package']); //There are no files?
//else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
-
+
//Hook ability to change the source file location..
$source = apply_filters('upgrader_source_selection', $source, $remote_source, $this);
if ( is_wp_error($source) )
return $source;
-
+
//Has the source location changed? If so, we need a new source_files list.
if ( $source !== $remote_source )
$source_files = array_keys( $wp_filesystem->dirlist($source) );
-
+
//Protection against deleting files in any important base directories.
if ( in_array( $destination, array(ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes') ) ) {
@@ -213,10 +213,10 @@
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
}
-
+
//Create destination if needed
if ( !$wp_filesystem->exists($remote_destination) )
if ( !$wp_filesystem->mkdir($remote_destination, FS_CHMOD_DIR) )
return new WP_Error('mkdir_failed', $this->strings['mkdir_failed'], $remote_destination);
-
+
// Copy new version of item into place.
$result = copy_dir($source, $remote_destination);
@@ -226,9 +226,9 @@
return $result;
}
-
- //Clear the Working folder?
+
+ //Clear the Working folder?
if ( $clear_working )
$wp_filesystem->delete($remote_source, true);
-
+
$destination_name = basename( str_replace($local_destination, '', $destination) );
if ( '.' == $destination_name )
@@ -246,5 +246,5 @@
return $this->result;
}
-
+
function run($options) {
@@ -278,5 +278,5 @@
return $download;
}
-
+
//Unzip's the file into a temporary directory
$working_dir = $this->unpack_package( $download );
@@ -287,5 +287,5 @@
//With the given options, this installs it to the destination directory.
- $result = $this->install_package( array(
+ $result = $this->install_package( array(
'source' => $working_dir,
'destination' => $destination,
@@ -306,5 +306,5 @@
return $result;
}
-
+
function maintenance_mode($enable = false) {
global $wp_filesystem;
@@ -321,5 +321,5 @@
}
}
-
+
}
@@ -327,5 +327,5 @@
var $result;
-
+
function upgrade_strings() {
$this->generic_strings();
@@ -352,5 +352,5 @@
function install($package) {
-
+
$this->install_strings();
@@ -362,5 +362,5 @@
'hook_extra' => array()
));
-
+
// Force refresh of plugin update information
delete_transient('update_plugins');
@@ -369,7 +369,7 @@
function upgrade($plugin) {
-
+
$this->upgrade_strings();
-
+
$current = get_transient( 'update_plugins' );
if ( !isset( $current->response[ $plugin ] ) ) {
@@ -381,5 +381,5 @@
// Get the URL to the zip file
$r = $current->response[ $plugin ];
-
+
add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
@@ -406,5 +406,5 @@
delete_transient('update_plugins');
}
-
+
//return plugin info.
function plugin_info() {
@@ -412,5 +412,5 @@
return false;
if ( empty($this->result['destination_name']) )
- return false;
+ return false;
$plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
@@ -420,5 +420,5 @@
$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
- return $this->result['destination_name'] . '/' . $pluginfiles[0];
+ return $this->result['destination_name'] . '/' . $pluginfiles[0];
}
@@ -437,5 +437,5 @@
//Deactivate the plugin silently, Prevent deactivation hooks from running.
deactivate_plugins($plugin, true);
- }
+ }
}
@@ -443,8 +443,8 @@
function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
global $wp_filesystem;
-
+
if ( is_wp_error($removed) )
return $removed; //Pass errors through.
-
+
$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
if ( empty($plugin) )
@@ -453,8 +453,8 @@
$plugins_dir = $wp_filesystem->wp_plugins_dir();
$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
-
+
if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished.
return $removed;
-
+
// If plugin is in its own directory, recursively delete the directory.
if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
@@ -465,5 +465,5 @@
if ( ! $deleted )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
-
+
return $removed;
}
@@ -498,5 +498,5 @@
function install($package) {
-
+
$this->install_strings();
@@ -507,15 +507,15 @@
'clear_working' => true
);
-
+
$this->run($options);
-
+
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
-
+
// Force refresh of theme update information
delete_transient('update_themes');
-
+
if ( empty($result['destination_name']) )
- return false;
+ return false;
else
return $result['destination_name'];
@@ -523,12 +523,12 @@
function upgrade($theme) {
-
+
$this->upgrade_strings();
-
+
// Is an update available?
$current = get_transient( 'update_themes' );
if ( !isset( $current->response[ $theme ] ) )
return new WP_Error('up_to_date', $this->strings['up_to_date']);
-
+
$r = $current->response[ $theme ];
@@ -546,5 +546,5 @@
)
);
-
+
$this->run($options);
@@ -557,7 +557,7 @@
return true;
}
-
+
function current_before($return, $theme) {
-
+
if ( is_wp_error($return) )
return $return;
@@ -593,13 +593,13 @@
return $return;
}
-
+
function delete_old_theme($removed, $local_destination, $remote_destination, $theme) {
global $wp_filesystem;
-
+
$theme = isset($theme['theme']) ? $theme['theme'] : '';
-
+
if ( is_wp_error($removed) || empty($theme) )
return $removed; //Pass errors through.
-
+
$themes_dir = $wp_filesystem->wp_themes_dir();
if ( $wp_filesystem->exists( trailingslashit($themes_dir) . $theme ) )
@@ -608,5 +608,5 @@
return true;
}
-
+
function theme_info() {
if ( empty($this->result['destination_name']) )
@@ -632,9 +632,9 @@
global $wp_filesystem;
$this->upgrade_strings();
-
-
+
+
if ( !empty($feedback) )
add_filter('update_feedback', $feedback);
-
+
// Is an update available?
if ( !isset( $current->response ) || $current->response == 'latest' )
@@ -644,11 +644,11 @@
if ( is_wp_error($res) )
return $res;
-
+
$wp_dir = trailingslashit($wp_filesystem->abspath());
-
+
$download = $this->download_package( $current->package );
if ( is_wp_error($download) )
return $download;
-
+
$working_dir = $this->unpack_package( $download );
if ( is_wp_error($working_dir) )
@@ -661,7 +661,7 @@
}
$wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
-
+
require(ABSPATH . 'wp-admin/includes/update-core.php');
-
+
return update_core($working_dir, $wp_dir);
}
@@ -678,8 +678,8 @@
class WP_Upgrader_Skin {
-
+
var $upgrader;
var $done_header = false;
-
+
function WP_Upgrader_Skin($args = array()) {
return __construct($args);
@@ -689,5 +689,5 @@
$this->options = wp_parse_args($args, $defaults);
}
-
+
function set_upgrader(&$upgrader) {
if ( is_object($upgrader) )
@@ -697,5 +697,5 @@
$this->result = $result;
}
-
+
function request_filesystem_credentials($error = false) {
$url = $this->options['url'];
@@ -704,5 +704,5 @@
return request_filesystem_credentials($url, '', $error); //Possible to bring inline, Leaving as0is for now.
}
-
+
function header() {
if ( $this->done_header )
@@ -711,10 +711,10 @@
echo '
';
echo screen_icon();
- echo '
' . $this->options['title'] . '
';
+ echo '' . $this->options['title'] . '
';
}
function footer() {
echo '';
}
-
+
function error($errors) {
if ( ! $this->done_header )
@@ -739,8 +739,8 @@
return;
show_message($string);
- }
+ }
function before() {}
function after() {}
-
+
}
@@ -760,8 +760,8 @@
$this->plugin_active = is_plugin_active($this->plugin);
-
+
parent::__construct($args);
}
-
+
function after() {
$this->plugin = $this->upgrader->plugin_info();
@@ -797,8 +797,8 @@
$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
$args = wp_parse_args($args, $defaults);
-
+
$this->type = $args['type'];
$this->api = isset($args['api']) ? $args['api'] : array();
-
+
parent::__construct($args);
}
@@ -808,5 +808,5 @@
$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin %s %s.'), $this->api->name, $this->api->version);
}
-
+
function after() {
@@ -843,8 +843,8 @@
$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
$args = wp_parse_args($args, $defaults);
-
+
$this->type = $args['type'];
$this->api = isset($args['api']) ? $args['api'] : array();
-
+
parent::__construct($args);
}
@@ -854,5 +854,5 @@
$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme %s %s.'), $this->api->name, $this->api->version);
}
-
+
function after() {
if ( empty($this->upgrader->result['destination_name']) )
@@ -865,8 +865,8 @@
$stylesheet = $this->upgrader->result['destination_name'];
$template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
-
+
$preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(clean_url(get_option('home'))) ) );
$activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-
+
$install_actions = array(
'preview' => '' . __('Preview') . '',
@@ -900,8 +900,8 @@
$this->theme = $args['theme'];
-
+
parent::__construct($args);
}
-
+
function after() {
@@ -915,5 +915,5 @@
$stylesheet = $this->upgrader->result['destination_name'];
$template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
-
+
$preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(clean_url(get_option('home'))) ) );
$activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
@@ -926,5 +926,5 @@
if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
unset($update_actions['preview'], $update_actions['activate']);
-
+
$update_actions = apply_filters('update_theme_complete_actions', $update_actions, $this->theme);
if ( ! empty($update_actions) )
@@ -943,8 +943,8 @@
if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
wp_die($uploads['error']);
-
+
if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
wp_die(__('Please select a file'));
-
+
if ( !empty($_FILES) )
$this->filename = $_FILES[$form]['name'];
@@ -956,5 +956,5 @@
$this->filename = wp_unique_filename( $uploads['basedir'], $this->filename );
$this->package = $uploads['basedir'] . '/' . $this->filename;
-
+
// Move the file to the uploads dir
if ( false === @ move_uploaded_file( $_FILES[$form]['tmp_name'], $this->package) )
Index: /trunk/wp-admin/includes/media.php
===================================================================
--- /trunk/wp-admin/includes/media.php (revision 11012)
+++ /trunk/wp-admin/includes/media.php (revision 11013)
@@ -1566,6 +1566,6 @@
- |
- |
+ |
+ |
Index: /trunk/wp-admin/includes/plugin-install.php
===================================================================
--- /trunk/wp-admin/includes/plugin-install.php (revision 11012)
+++ /trunk/wp-admin/includes/plugin-install.php (revision 11013)
@@ -202,5 +202,5 @@
* Upload from zip
* @since 2.8.0
- *
+ *
* @param string $page
*/
Index: /trunk/wp-admin/includes/template.php
===================================================================
--- /trunk/wp-admin/includes/template.php (revision 11012)
+++ /trunk/wp-admin/includes/template.php (revision 11013)
@@ -1570,11 +1570,11 @@
while ( $find_main_page > 0 ) {
$parent = get_page($find_main_page);
-
+
if ( is_null($parent) )
break;
-
+
$level++;
$find_main_page = (int)$parent->post_parent;
-
+
if ( !isset($parent_name) )
$parent_name = $parent->post_title;
Index: /trunk/wp-admin/includes/theme-install.php
===================================================================
--- /trunk/wp-admin/includes/theme-install.php (revision 11012)
+++ /trunk/wp-admin/includes/theme-install.php (revision 11013)
@@ -404,8 +404,8 @@
$rows = ceil(count($themes) / 3);
$table = array();
- $theme_keys = array_keys($themes);
- for ( $row = 1; $row <= $rows; $row++ )
- for ( $col = 1; $col <= 3; $col++ )
- $table[$row][$col] = array_shift($theme_keys);
+ $theme_keys = array_keys($themes);
+ for ( $row = 1; $row <= $rows; $row++ )
+ for ( $col = 1; $col <= 3; $col++ )
+ $table[$row][$col] = array_shift($theme_keys);
foreach ( $table as $row => $cols ) {
@@ -422,6 +422,6 @@
?>
|
Index: /trunk/wp-admin/includes/update.php
===================================================================
--- /trunk/wp-admin/includes/update.php (revision 11012)
+++ /trunk/wp-admin/includes/update.php (revision 11013)
@@ -178,5 +178,5 @@
function wp_update_theme($theme, $feedback = '') {
-
+
if ( !empty($feedback) )
add_filter('update_feedback', $feedback);
@@ -189,5 +189,5 @@
function wp_update_core($current, $feedback = '') {
-
+
if ( !empty($feedback) )
add_filter('update_feedback', $feedback);
Index: /trunk/wp-admin/includes/user.php
===================================================================
--- /trunk/wp-admin/includes/user.php (revision 11012)
+++ /trunk/wp-admin/includes/user.php (revision 11013)
@@ -413,5 +413,5 @@
$id = (int) $id;
- $user = new WP_User($id);
+ $user = new WP_User($id);
// allow for transaction statement
@@ -449,5 +449,5 @@
wp_cache_delete($user->user_email, 'useremail');
wp_cache_delete($user->user_nicename, 'userslugs');
-
+
// allow for commit transaction
do_action('deleted_user', $id);
Index: /trunk/wp-admin/load-scripts.php
===================================================================
--- /trunk/wp-admin/load-scripts.php (revision 11012)
+++ /trunk/wp-admin/load-scripts.php (revision 11013)
@@ -1,7 +1,7 @@
$plugins_per_page )
$plugins = array_slice($plugins, $start, $plugins_per_page);
-
+
print_plugins_table($plugins, $status);
?>
Index: /trunk/wp-admin/press-this.php
===================================================================
--- /trunk/wp-admin/press-this.php (revision 11012)
+++ /trunk/wp-admin/press-this.php (revision 11013)
@@ -59,5 +59,5 @@
$desc = isset($_REQUEST['photo_description'][$key]) ? $_REQUEST['photo_description'][$key] : '';
$upload = media_sideload_image($image, $post_ID, $desc);
-
+
// Replace the POSTED content with correct uploaded ones. Regex contains fix for Magic Quotes
if( !is_wp_error($upload) ) $content = preg_replace('/]*)src=\\\?(\"|\')'.preg_quote($image, '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
@@ -451,5 +451,5 @@
-
+
@@ -466,5 +466,5 @@
-
+
@@ -525,5 +525,5 @@
-
+
-
Add:
Index: /trunk/wp-admin/update.php
===================================================================
--- /trunk/wp-admin/update.php (revision 11012)
+++ /trunk/wp-admin/update.php (revision 11013)
@@ -35,5 +35,5 @@
include('admin-footer.php');
-
+
} elseif ('activate-plugin' == $action ) {
if ( ! current_user_can('update_plugins') )
@@ -64,16 +64,16 @@
include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
-
+
check_admin_referer('install-plugin_' . $plugin);
$api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-
+
if ( is_wp_error($api) )
wp_die($api);
-
+
$title = __('Plugin Install');
$parent_file = 'plugins.php';
$submenu_file = 'plugin-install.php';
require_once('admin-header.php');
-
+
$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
$nonce = 'install-plugin_' . $plugin;
@@ -83,5 +83,5 @@
$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
$upgrader->install($api->download_link);
-
+
include('admin-footer.php');
@@ -99,5 +99,5 @@
$submenu_file = 'plugin-install.php';
require_once('admin-header.php');
-
+
$title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
$nonce = 'plugin-upload';
@@ -131,5 +131,5 @@
include('admin-footer.php');
-
+
} elseif ( 'install-theme' == $action ) {
@@ -138,5 +138,5 @@
include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
-
+
check_admin_referer('install-theme_' . $theme);
$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
@@ -151,15 +151,15 @@
$submenu_file = 'theme-install.php';
require_once('admin-header.php');
-
+
$title = sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version );
$nonce = 'install-theme_' . $theme;
$url = 'update.php?action=install-theme&theme=' . $theme;
$type = 'web'; //Install theme type, From Web or an Upload.
-
+
$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
$upgrader->install($api->download_link);
-
+
include('admin-footer.php');
-
+
} elseif ( 'upload-theme' == $action ) {
Index: /trunk/wp-content/themes/default/sidebar.php
===================================================================
--- /trunk/wp-content/themes/default/sidebar.php (revision 11012)
+++ /trunk/wp-content/themes/default/sidebar.php (revision 11013)
@@ -50,5 +50,5 @@
-
+
Pages' ); ?>
Index: /trunk/wp-includes/classes.php
===================================================================
--- /trunk/wp-includes/classes.php (revision 11012)
+++ /trunk/wp-includes/classes.php (revision 11013)
@@ -1185,6 +1185,6 @@
$css_class[] = 'current_page_parent';
}
-
- $css_class = implode(' ', apply_filters('page_css_class', $css_class, $page));
+
+ $css_class = implode(' ', apply_filters('page_css_class', $css_class, $page));
$output .= $indent . '- ' . $link_before . apply_filters('the_title', $page->post_title) . $link_after . '';
Index: /trunk/wp-includes/comment-template.php
===================================================================
--- /trunk/wp-includes/comment-template.php (revision 11012)
+++ /trunk/wp-includes/comment-template.php (revision 11013)
@@ -909,10 +909,10 @@
function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post;
-
+
if ( false === $zero ) $zero = __( 'No Comments' );
if ( false === $one ) $one = __( '1 Comment' );
if ( false === $more ) $more = __( '% Comments' );
if ( false === $none ) $none = __( 'Comments Off' );
-
+
$number = get_comments_number( $id );
@@ -1116,5 +1116,5 @@
function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = TRUE ) {
global $comment;
-
+
if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
Index: /trunk/wp-includes/feed-atom-comments.php
===================================================================
--- /trunk/wp-includes/feed-atom-comments.php (revision 11012)
+++ /trunk/wp-includes/feed-atom-comments.php (revision 11013)
@@ -41,5 +41,5 @@
-
+
get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
- else
+ else
$installed = $alloptions['siteurl'];
$wpdb->suppress_errors( $suppress );
Index: /trunk/wp-includes/link-template.php
===================================================================
--- /trunk/wp-includes/link-template.php (revision 11012)
+++ /trunk/wp-includes/link-template.php (revision 11013)
@@ -935,5 +935,5 @@
$date = mysql2date(get_option('date_format'), $post->post_date);
-
+
$title = str_replace('%title', $post->post_title, $title);
$title = str_replace('%date', $date, $title);
@@ -1051,6 +1051,6 @@
function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
$posts = get_boundary_post($in_same_cat,$excluded_categories,$start);
- // Even though we limited get_posts to return only 1 item it still returns an array of objects.
- $post = $posts[0];
+ // Even though we limited get_posts to return only 1 item it still returns an array of objects.
+ $post = $posts[0];
if ( empty($post) )
@@ -1105,5 +1105,5 @@
*/
function index_rel_link() {
- echo get_index_rel_link();
+ echo get_index_rel_link();
}
Index: /trunk/wp-includes/post-template.php
===================================================================
--- /trunk/wp-includes/post-template.php (revision 11012)
+++ /trunk/wp-includes/post-template.php (revision 11013)
@@ -415,5 +415,5 @@
} elseif ( is_page() ) {
$classes[] = 'page';
-
+
$wp_query->post = $wp_query->posts[0];
setup_postdata($wp_query->post);
Index: /trunk/wp-includes/query.php
===================================================================
--- /trunk/wp-includes/query.php (revision 11012)
+++ /trunk/wp-includes/query.php (revision 11013)
@@ -2007,5 +2007,5 @@
$q['author'] = get_user_by('slug', $q['author_name']);
if ( $q['author'] )
- $q['author'] = $q['author']->ID;
+ $q['author'] = $q['author']->ID;
$whichauthor .= " AND ($wpdb->posts.post_author = ".absint($q['author']).')';
}
Index: /trunk/wp-includes/registration.php
===================================================================
--- /trunk/wp-includes/registration.php (revision 11012)
+++ /trunk/wp-includes/registration.php (revision 11013)
@@ -188,5 +188,5 @@
$user_nicename = $alt_user_nicename;
}
-
+
$data = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
$data = stripslashes_deep( $data );
Index: /trunk/wp-includes/script-loader.php
===================================================================
--- /trunk/wp-includes/script-loader.php (revision 11012)
+++ /trunk/wp-includes/script-loader.php (revision 11013)
@@ -169,5 +169,5 @@
$scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.5-1');
-
+
if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031');
Index: /trunk/wp-includes/taxonomy.php
===================================================================
--- /trunk/wp-includes/taxonomy.php (revision 11012)
+++ /trunk/wp-includes/taxonomy.php (revision 11013)
@@ -24,5 +24,5 @@
$wp_taxonomies['post_tag'] = (object) array('name' => 'post_tag', 'object_type' => 'post', 'hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'));
$wp_taxonomies['link_category'] = (object) array('name' => 'link_category', 'object_type' => 'link', 'hierarchical' => false);
-
+
}
add_action( 'init', 'create_initial_taxonomies' );
@@ -1079,5 +1079,5 @@
* The $args 'default' will only override the terms found, if there is only one
* term found. Any other and the found terms are used.
- *
+ *
* The $args 'force_default' will force the term supplied as default to be
* assigned even if the object was not going to be termless
@@ -1414,5 +1414,5 @@
*
* @param int $object_id The object to relate to.
- * @param array|int|string $term The slug or id of the term, will replace all existing
+ * @param array|int|string $term The slug or id of the term, will replace all existing
* related terms in this taxonomy.
* @param array|string $taxonomy The context in which to relate the term to the object.
Index: /trunk/wp-includes/theme.php
===================================================================
--- /trunk/wp-includes/theme.php (revision 11012)
+++ /trunk/wp-includes/theme.php (revision 11013)
@@ -187,10 +187,10 @@
if ( preg_match( '|Theme URI:(.*)$|mi', $theme_data, $theme_uri ) )
$theme_uri = clean_url( trim( $theme_uri[1] ) );
- else
+ else
$theme_uri = '';
-
+
if ( preg_match( '|Description:(.*)$|mi', $theme_data, $description ) )
$description = wptexturize( wp_kses( trim( $description[1] ), $themes_allowed_tags ) );
- else
+ else
$description = '';
@@ -375,5 +375,5 @@
@ $stylesheet_dir->close();
}
-
+
$template_dir = @ dir("$theme_root/$template");
if ( $template_dir ) {
@@ -394,5 +394,5 @@
}
}
- @ $template_dir->close();
+ @ $template_dir->close();
}
@@ -1151,5 +1151,5 @@
$theme_dir = str_replace('\\','/', get_theme_root()); // sanitize for Win32 installs
$theme_dir = preg_replace('|/+|','/', $theme_dir); // remove any duplicate slash
- $file = preg_replace('|^.*/themes/.*?/|','',$file); // get relative path from theme dir
+ $file = preg_replace('|^.*/themes/.*?/|','',$file); // get relative path from theme dir
return $file;
}
Index: /trunk/wp-includes/widgets.php
===================================================================
--- /trunk/wp-includes/widgets.php (revision 11012)
+++ /trunk/wp-includes/widgets.php (revision 11013)
@@ -36,5 +36,5 @@
/** Echo the widget content.
- *
+ *
* Subclasses should over-ride this function to generate their widget code.
*
@@ -47,5 +47,5 @@
/** Update a particular instance.
- *
+ *
* This function should check that $new_instance is set correctly.
* The newly calculated value of $instance should be returned.
@@ -61,5 +61,5 @@
/** Echo the settings update form
- *
+ *
* @param array $instance Current settings
*/
@@ -97,7 +97,7 @@
/** Constructs name attributes for use in form() fields
- *
+ *
* This function should be used in form() methods to create name attributes for fields to be saved by update()
- *
+ *
* @param string $field_name Field name
* @return string Name attribute for $field_name
@@ -108,7 +108,7 @@
/** Constructs id attributes for use in form() fields
- *
+ *
* This function should be used in form() methods to create id attributes for fields to be saved by update()
- *
+ *
* @param string $field_name Field name
* @return string ID attribute for $field_name
Index: /trunk/wp-includes/wp-db.php
===================================================================
--- /trunk/wp-includes/wp-db.php (revision 11012)
+++ /trunk/wp-includes/wp-db.php (revision 11013)
@@ -752,5 +752,5 @@
}
-
+
/**
* Update a row in the table