diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-29 14:36:34 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-29 14:36:34 +0000 |
| commit | fef18a3dfb388c79cb8aa60832ea4a01f68718ab (patch) | |
| tree | 989a39736de98c99903236649b1d1b0358ccc6d9 /wp-inst/wp-admin/admin-functions.php | |
| parent | 4bfcc23eea03bb1e51fcac429c336265efb66b57 (diff) | |
| download | wordpress-mu-fef18a3dfb388c79cb8aa60832ea4a01f68718ab.tar.gz wordpress-mu-fef18a3dfb388c79cb8aa60832ea4a01f68718ab.tar.xz wordpress-mu-fef18a3dfb388c79cb8aa60832ea4a01f68718ab.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@450 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin-functions.php')
| -rw-r--r-- | wp-inst/wp-admin/admin-functions.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php index 946aaa4..cfce700 100644 --- a/wp-inst/wp-admin/admin-functions.php +++ b/wp-inst/wp-admin/admin-functions.php @@ -81,10 +81,6 @@ function relocate_children($old_ID, $new_ID) { function fix_attachment_links($post_ID) { global $wp_rewrite; - // Relevance check. - if ( false == $wp_rewrite->using_permalinks() ) - return; - $post = & get_post($post_ID); $search = "#<a[^>]+rel=('|\")[^'\"]*attachment[^>]*>#ie"; @@ -869,7 +865,7 @@ function add_meta($post_ID) { $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput']))); $metavalue = $wpdb->escape(stripslashes(trim($_POST['metavalue']))); - if (!empty ($metavalue) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput))) { + if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) { // We have a key/value pair. If both the select and the // input for the key have data, the input takes precedence: |