Changeset 3329

Timestamp:

12/19/2005 07:10:09 PM (20 years ago)

Author:

ryan

Message:

Validation tweaks. fixes #2097

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-admin/inline-uploading.php (modified) (6 diffs)
• wp-includes/template-functions-post.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -94 +94 @@
 
     $i = 0;
-    $search = "# id=(\"|)(\d+)\\1#i";
+    $search = "# id=(\"|')p(\d+)\\1#i";
     foreach ( $anchor_matches[0] as $anchor ) {
         if ( 0 == preg_match($search, $anchor, $id_matches) )

trunk/wp-admin/inline-uploading.php

@@ -233 +233 @@
             $ypadding = (96 - $image['uheight']) / 2;
             $style .= "#target{$ID} img { padding: {$ypadding}px {$xpadding}px; }\n";
-            $script .= "aa[{$ID}] = '<a id=\"{$ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';
+            $script .= "aa[{$ID}] = '<a id=\"p{$ID}\" rel=\"attachment\" class=\"imagelink\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';
 ab[{$ID}] = '<a class=\"imagelink\" href=\"{$image['guid']}\" onclick=\"doPopup({$ID});return false;\" title=\"{$image['post_title']}\">';
 imga[{$ID}] = '<img id=\"image{$ID}\" src=\"$src\" alt=\"{$image['post_title']}\" $height_width />';
@@ -256 +256 @@
             $icon = get_attachment_icon($ID);
             $toggle_icon = "<a id=\"I{$ID}\" onclick=\"toggleOtherIcon({$ID});return false;\" href=\"javascript:void()\">$__using_title</a>";
-            $script .= "aa[{$ID}] = '<a id=\"{$ID}\" rel=\"attachment\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">{$attachment['post_title']}</a>';
-ab[{$ID}] = '<a id=\"{$ID}\" href=\"{$filename}\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">{$attachment['post_title']}</a>';
+            $script .= "aa[{$ID}] = '<a id=\"p{$ID}\" rel=\"attachment\" href=\"$href\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">{$attachment['post_title']}</a>';
+ab[{$ID}] = '<a id=\"p{$ID}\" href=\"{$filename}\" onclick=\"doPopup({$ID});return false;\" title=\"{$title}\">{$attachment['post_title']}</a>';
 title[{$ID}] = '{$attachment['post_title']}';
 filename[{$ID}] = '{$filename}';
@@ -264 +264 @@
             $html .= "<div id='target{$ID}' class='attwrap left'>
     <div id='div{$ID}' class='otherwrap usingtext' onmousedown=\"selectLink({$ID})\" onclick=\"doPopup({$ID});return false;\">
-        <a id=\"{$ID}\" href=\"{$attachment['guid']}\" onmousedown=\"selectLink({$ID});\" onclick=\"return false;\">{$attachment['post_title']}</a>
+        <a id=\"p{$ID}\" href=\"{$attachment['guid']}\" onmousedown=\"selectLink({$ID});\" onclick=\"return false;\">{$attachment['post_title']}</a>
     </div>
     {$noscript}
@@ -347 +347 @@
     od=document.getElementById('div'+n);
     ol=document.getElementById('L'+n);
-    oi=document.getElementById(n);
+    oi=document.getElementById('p'+n);
     ih=oi.innerHTML;
     if ( ol.innerHTML == linkedtofile ) {
@@ -356 +356 @@
         ol.innerHTML = linkedtofile;
     }
-    oi=document.getElementById(n);
+    oi=document.getElementById('p'+n);
     oi.innerHTML = ih;
 }
@@ -372 +372 @@
 function toggleOtherIcon(n) {
     od = document.getElementById('div'+n);
-    o = document.getElementById(n);
+    o = document.getElementById('p'+n);
     oi = document.getElementById('I'+n);
     if ( oi.innerHTML == usingtitle ) {

trunk/wp-includes/template-functions-post.php

@@ -535 +535 @@
     }
 
-    $icon = "<img src=\"{$src}\" title=\"{$post->post_title}\" {$constraint}/>";
+    $icon = "<img src=\"{$src}\" title=\"{$post->post_title}\" alt=\"{$post->post_title}\" {$constraint}/>";
 
     return apply_filters('attachment_icon', $icon, $post->ID);