diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-12-01 12:27:29 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-12-01 12:27:29 +0000 |
commit | aae5b160f307adf0703ae8f7c2b158b91570ec95 (patch) | |
tree | ba0d1eee6e2eedfe3fd0a693d773162ab9dc8a67 /wp-admin/admin-functions.php | |
parent | 9415bbca12c01c39da58e0ed2c4e6b44ff833e5d (diff) | |
download | wordpress-mu-aae5b160f307adf0703ae8f7c2b158b91570ec95.tar.gz wordpress-mu-aae5b160f307adf0703ae8f7c2b158b91570ec95.tar.xz wordpress-mu-aae5b160f307adf0703ae8f7c2b158b91570ec95.zip |
WP Merge to 4578, except for script-loader
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@817 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
-rw-r--r-- | wp-admin/admin-functions.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index aaf16ca..624b693 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1268,16 +1268,16 @@ function save_mod_rewrite_rules() { $home_path = get_home_path(); if (!$wp_rewrite->using_mod_rewrite_permalinks() ) - return; + return false; if (!((!file_exists( $home_path.'.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path.'.htaccess' ) ) ) - return; + return false; if (! got_mod_rewrite() ) - return; + return false; $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() ); - insert_with_markers( $home_path.'.htaccess', 'WordPress', $rules ); + return insert_with_markers( $home_path.'.htaccess', 'WordPress', $rules ); } function get_broken_themes() { @@ -2097,7 +2097,7 @@ function wp_check_for_changed_slugs($post_id) { if ( $post->post_name == $_POST['wp-old-slug'] ) return $post_id; - $old_slugs = get_post_meta($post_id, '_wp_old_slug'); + $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug'); // if we haven't added this old slug before, add it now if ( !count($old_slugs) || !in_array($_POST['wp-old-slug'], $old_slugs) ) |