summaryrefslogtreecommitdiffstats
path: root/wp-includes
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-10-08 13:15:02 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-10-08 13:15:02 +0000
commitdf0291bf93ac47a18e7cec154ff68f1410e94ab8 (patch)
tree39af82e8b4e137d76d349475f375e3024a7c2570 /wp-includes
parent5e8d0094b69f1b2fd02798e8acff5a0db8b23139 (diff)
downloadwordpress-mu-df0291bf93ac47a18e7cec154ff68f1410e94ab8.tar.gz
wordpress-mu-df0291bf93ac47a18e7cec154ff68f1410e94ab8.tar.xz
wordpress-mu-df0291bf93ac47a18e7cec154ff68f1410e94ab8.zip
Minor whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1503 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
-rw-r--r--wp-includes/functions.php4
-rw-r--r--wp-includes/plugin.php1
-rw-r--r--wp-includes/wpmu-functions.php8
3 files changed, 7 insertions, 6 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index d66e275..9f482af 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1481,7 +1481,7 @@ function wp_upload_dir( $time = NULL ) {
// $dir is absolute, $path is (maybe) relative to ABSPATH
$dir = path_join( ABSPATH, $dir );
-
+
if ( !$url = get_option( 'upload_url_path' ) ) {
if ( empty($upload_path) or ( $upload_path == $dir ) )
$url = WP_CONTENT_URL . '/uploads';
@@ -1515,7 +1515,7 @@ function wp_upload_dir( $time = NULL ) {
$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $dir );
return array( 'error' => $message );
}
-
+
$uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
return apply_filters( 'upload_dir', $uploads );
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 57e2677..c161119 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -452,6 +452,7 @@ function plugin_basename($file) {
$plugin_dir = str_replace('\\','/',WP_PLUGIN_DIR); // sanitize for Win32 installs
$plugin_dir = preg_replace('|/+|','/', $plugin_dir); // remove any duplicate slash
$file = preg_replace('|^' . preg_quote($plugin_dir, '|') . '/|','',$file); // get relative path from plugins dir
+
$file = preg_replace('|^.*/' . MUPLUGINDIR . '/|','',$file); // get relative path from plugins dir
return $file;
}
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index ba7017b..ff004b8 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -16,7 +16,7 @@ function load_muplugin_textdomain($domain, $path = false) {
function wpmu_update_blogs_date() {
global $wpdb;
-
+
$wpdb->update( $wpdb->blogs, array('last_updated' => current_time('mysql')), array('blog_id' => $wpdb->blogid) );
refresh_blog_details( $wpdb->blogid );
@@ -460,7 +460,7 @@ function get_active_blog_for_user( $user_id ) { // get an active blog for user -
}
}
-function is_user_member_of_blog( $user_id, $blog_id = 0 ) {
+function is_user_member_of_blog( $user_id, $blog_id = 0 ) {
$user_id = (int) $user_id;
$blog_id = (int) $blog_id;
@@ -1168,7 +1168,7 @@ function wpmu_create_user( $user_name, $password, $email) {
return false;
$user_id = wp_create_user( $user_name, $password, $email );
- $user = new WP_User($user_id);
+ $user = new WP_User($user_id);
// Newly created users have no roles or caps until they are added to a blog.
update_usermeta($user_id, 'capabilities', '');
@@ -1787,7 +1787,7 @@ function global_terms( $term_id, $deprecated = '' ) {
if( get_option( 'default_category' ) == $term_id )
update_option( 'default_category', $global_id );
-
+
$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
$wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );