Changeset 4748

Timestamp:

01/16/2007 06:10:54 PM (18 years ago)

Author:

ryan

Message:

Send to Editor fixes from mdawaffe. fixes #3594

Location:

trunk

Files:

• wp-admin/upload-js.php (modified) (6 diffs)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/upload-js.php

@@ -57 +57 @@
                 this.currentImage.height = false;
             }
-            this.currentImage.isImage = ( 0 == id ? '' : $('attachment-is-image-' + id).value );
+            this.currentImage.isImage = ( 0 == id ? 0 : $('attachment-is-image-' + id).value );
             this.currentImage.ID = id;
         },
@@ -75 +75 @@
             }
             h += "<div id='file-title'>"
-            if ( !this.currentImage.isImage )
+            if ( 0 == this.currentImage.isImage )
                 h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>" + this.currentImage.title + "</a></h2>";
             else
@@ -84 +84 @@
             h += '</div>'
             h += "<div id='upload-file-view' class='alignleft'>";
-            if ( this.currentImage.isImage ) {
+            if ( 1 == this.currentImage.isImage ) {
                 h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>";
                 h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
@@ -153 +153 @@
             }
             h += "<div id='file-title'>"
-            if ( !this.currentImage.isImage )
+            if ( 0 == this.currentImage.isImage )
                 h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>" + this.currentImage.title + "</a></h2>";
             else
@@ -162 +162 @@
             h += '</div>'
             h += "<div id='upload-file-view' class='alignleft'>";
-            if ( this.currentImage.isImage ) {
+            if ( 1 == this.currentImage.isImage ) {
                 h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo wp_specialchars(__('Direct link to file')); ?>'>";
                 h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
@@ -231 +231 @@
             if ( displayEl )
                 display = displayEl.value;
-            else if ( this.currentImage.isImage )
+            else if ( 1 == this.currentImage.isImage )
                 display = 'full';
 

trunk/wp-includes/post-template.php

@@ -369 +369 @@
     }
 
-    if ( !isset($src) )
+    if ( !isset($src) || !$src )
         return false;
+
     return array($src, $src_file);
 }

trunk/wp-includes/script-loader.php

@@ -39 +39 @@
             $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' );
             $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
-            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20061223' );
+            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070116' );
         }
     }