[wp-cvs] wordpress/wp-admin link-add.php, 1.14, 1.15 link-manager.php, 1.31, 1.32

[Jason Verber]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3362/wp-admin

Modified Files:
	link-add.php link-manager.php 
Log Message:
Fix for bug #0000076: http:// added to links in link-manager when needed. Also more special chars. encoding.

Index: link-manager.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-manager.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** link-manager.php	19 Jun 2004 04:33:32 -0000	1.31
--- link-manager.php	19 Jun 2004 04:41:34 -0000	1.32
***************
*** 186,189 ****
--- 186,190 ----
  
      $link_url = $_POST['linkurl'];
+     $link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://' . $link_url; 
      $link_name = $_POST['name'];
      $link_image = $_POST['image'];
***************
*** 236,239 ****
--- 237,241 ----
        $link_id = $_POST['link_id'];
        $link_url = $_POST['linkurl'];
+       $link_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $link_url) ? $link_url : 'http://' . $link_url; 
        $link_name = $_POST['name'];
        $link_image = $_POST['image'];

Index: link-add.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-add.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** link-add.php	15 Jun 2004 23:24:35 -0000	1.14
--- link-add.php	19 Jun 2004 04:41:34 -0000	1.15
***************
*** 15,19 ****
        if ($row->cat_id == $selected)
          echo " selected";
!         echo ">".$row->cat_id.": ".$row->cat_name;
          if ($row->auto_toggle == 'Y')
              echo ' (auto toggle)';
--- 15,19 ----
        if ($row->cat_id == $selected)
          echo " selected";
!         echo ">".$row->cat_id.": ".htmlspecialchars($row->cat_name);
          if ($row->auto_toggle == 'Y')
              echo ' (auto toggle)';