Changeset 7348 for trunk/wp-admin/includes/media.php

Timestamp:

03/17/2008 08:08:43 PM (18 years ago)

Author:

ryan

Message:

do not insert empty links; use the file basename if no title given. Props andy. fixes #6249

File:

• trunk/wp-admin/includes/media.php (modified) (6 diffs)

trunk/wp-admin/includes/media.php

@@ -269 +269 @@
     if ( !empty($_POST['insertonlybutton']) ) {
         $src = $_POST['insertonly']['src'];
-        if ( !strpos($src, '://') )
+        if ( !empty($src) && !strpos($src, '://') )
             $src = "http://$src";
         $alt = attribute_escape($_POST['insertonly']['alt']);
@@ -276 +276 @@
             $class = " class='align$align'";
         }
-        $html = "<img src='$src' alt='$alt'$class />";
+        if ( !empty($src) )
+            $html = "<img src='$src' alt='$alt'$class />";
         return media_send_to_editor($html);
     }
@@ -305 +306 @@
     if ( !empty($_POST['insertonlybutton']) ) {
         $href = $_POST['insertonly']['href'];
-        if ( !strpos($href, '://') )
+        if ( !empty($href) && !strpos($href, '://') )
             $href = "http://$href";
         $title = attribute_escape($_POST['insertonly']['title']);
-        $html = "<a href='$href' >$title</a>";
+        if ( empty($title) )
+            $title = basename($href);
+        if ( !empty($title) && !empty($href) )
+            $html = "<a href='$href' >$title</a>";
         return media_send_to_editor($html);
     }
@@ -337 +341 @@
     if ( !empty($_POST['insertonlybutton']) ) {
         $href = $_POST['insertonly']['href'];
-        if ( !strpos($href, '://') )
+        if ( !empty($href) && !strpos($href, '://') )
             $href = "http://$href";
         $title = attribute_escape($_POST['insertonly']['title']);
-        $html = "<a href='$href' >$title</a>";
+        if ( empty($title) )
+            $title = basename($href);
+        if ( !empty($title) && !empty($href) )
+            $html = "<a href='$href' >$title</a>";
         return media_send_to_editor($html);
     }
@@ -369 +376 @@
     if ( !empty($_POST['insertonlybutton']) ) {
         $href = $_POST['insertonly']['href'];
-        if ( !strpos($href, '://') )
+        if ( !empty($href) && !strpos($href, '://') )
             $href = "http://$href";
         $title = attribute_escape($_POST['insertonly']['title']);
-        $html = "<a href='$href' >$title</a>";
+        if ( empty($title) )
+            $title = basename($href);
+        if ( !empty($title) && !empty($href) )
+            $html = "<a href='$href' >$title</a>";
         return media_send_to_editor($html);
     }
@@ -1068 +1078 @@
             <th valign="top" scope="row" class="label">
                 <span class="alignleft"><label for="insertonly[alt]">' . __('Description') . '</label></span>
-                <span class="alignright"><abbr title="required">*</abbr></span>
+                <span class="alignright"><abbr title="required" class="required">*</abbr></span>
             </th>
             <td class="field"><input id="insertonly[alt]" name="insertonly[alt]" value="" type="text"></td>