Changeset 3145

Timestamp:

11/18/05 09:25:47 (3 years ago)

Author:

ryan

Message:

Attachment cleanups from skeltoac. fixes #1870

Files:

• trunk/wp-admin/admin-functions.php (modified) (3 diffs)
• trunk/wp-admin/admin-header.php (modified) (1 diff)
• trunk/wp-admin/inline-uploading.php (modified) (5 diffs)
• trunk/wp-includes/comment-functions.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -64 +64 @@
-        relocate_children($_POST['temp_ID'], $post_ID);
-
+    // Now that we have an ID we can fix any attachment anchor hrefs
+    fix_attachment_links($post_ID);
+
-    return $post_ID;
-}
@@ -73 +76 @@
-    $new_ID = (int) $new_ID;
-    return $wpdb->query("UPDATE $wpdb->posts SET post_parent = $new_ID WHERE post_parent = $old_ID");
+}
+
+// Replace hrefs of attachment anchors with up-to-date permalinks.
+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";
+
+    // See if we have any rel="attachment" links
+    if ( 0 == preg_match_all($search, $post->post_content, $anchor_matches, PREG_PATTERN_ORDER) )
+        return;
+
+    $i = 0;
+    $search = "# id=(\"|)(\d+)\\1#i";
+    foreach ( $anchor_matches[0] as $anchor ) {
+        echo "$search\n$anchor\n";
+        if ( 0 == preg_match($search, $anchor, $id_matches) )
+            continue;
+
+        $id = $id_matches[2];
+        $post_search[$i] = $anchor;
+        $post_replace[$i] = preg_replace("#href=(\"|')[^'\"]*\\1#e", "stripslashes('href=\\1').get_attachment_link($id).stripslashes('\\1')", $anchor);
+        ++$i;
+    }
+
+    $post->post_content = str_replace($post_search, $post_replace, $post->post_content);
+
+    return wp_update_post($post);
-}
-
@@ -140 +177 @@
-
-    wp_update_post($_POST);
+
+    // Now that we have an ID we can fix any attachment anchor hrefs
+    fix_attachment_links($_POST['ID']);
-
-    // Meta Stuff

trunk/wp-admin/admin-header.php

@@ -106 +106 @@
-    remove_linebreaks : true,
-    save_callback : "wp_save_callback",
-
+id|
-    plugins : "wordpress,autosave"
-    <?php do_action('mce_options'); ?>

trunk/wp-admin/inline-uploading.php

@@ -78 +78 @@
-$imagedata['thumb'] = "thumb-$filename";
-
-image
+_wp_attachment_meta
-
-if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
@@ -136 +136 @@
-}
-
-$i = 0;
-$uwidth_sum = 0;
-$images_html = '';
@@ -155 +154 @@
-    $images_script .= "thumbnailon = '$__thumbnail_on';\nthumbnailoff = '$__thumbnail_off';\n";
-    foreach ( $images as $key => $image ) {
-
+
+
-        if (!is_array($meta)) {
-
-
+
+
+
+
+
+
-        }
-        $image = array_merge($image, $meta);
-        if ( ($image['width'] > 128 || $image['height'] > 96) && !empty($image['thumb']) && file_exists(dirname($image['file']).'/'.$image['thumb']) ) {
-            $src = str_replace(basename($image['guid']), '', $image['guid']) . $image['thumb'];
-i."a = '$src';\nsrc".$i
+attachment_ID."a = '$src';\nsrc".$attachment_ID
-            $thumb = 'true';
-            $thumbtext = $__thumbnail_on;
@@ -176 +180 @@
-        $xpadding = (128 - $image['uwidth']) / 2;
-        $ypadding = (96 - $image['uheight']) / 2;
-
-
-
-
+
+
+
-        $images_html .= "
-$i
-$i
-$i\" onclick=\"toggleLink($i
-$i\" onclick=\"if($thumb)toggleImage($i
-$attachment
+{$attachment_ID}
+{$attachment_ID}
+{$attachment_ID}\" onclick=\"toggleLink({$attachment_ID}
+{$attachment_ID}\" onclick=\"if($thumb)toggleImage({$attachment_ID}
+{$attachment_ID}
-        <a onclick=\"popup.style.display='none';return false;\" href=\"javascript:void()\">$__close</a>
-    </div>
-link$i\" class=\"imagelink\" href=\"$href\" onclick=\"imagePopup($i
-'image$i' src='$src' alt='{$image['post_title']}'
+{$attachment_ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"imagePopup({$attachment_ID}
+\"image{$attachment_ID}\" src=\"$src\" alt=\"{$attachment_ID}\"
-    </a>
-</div>
-";
-        $i++;
-    }
-}
@@ -243 +245 @@
-}
-function toggleLink(n) {
-'link'+
+
-    oi=document.getElementById('L'+n);
-    if ( oi.innerHTML == attachmenton ) {

trunk/wp-includes/comment-functions.php

@@ -623 +623 @@
-
-    foreach($post_links_temp[0] as $link_test) :
-
+
+
-            $test = parse_url($link_test);
-            if (isset($test['query']))
@@ -754 +755 @@
-}
-
+function is_local_attachment($url) {
+    if ( !strstr($url, get_bloginfo('home') ) )
+        return false;
+    if ( strstr($url, get_bloginfo('home') . '/?attachment_id=') )
+        return true;
+    if ( $id = url_to_postid($url) ) {
+        $post = & get_post($id);
+        if ( 'attachment' == $post->post_status )
+            return true;
+    }       
+    return false;
+}
-
-function wp_set_comment_status($comment_id, $comment_status) {
@@ -789 +802 @@
-}
-
-
-function wp_get_comment_status($comment_id) {
-    global $wpdb;