[wp-cvs] wordpress/wp-includes template-functions-links.php, 1.18, 1.19

[Ryan Boren]

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

Modified Files:
	template-functions-links.php 
Log Message:
posts_nav_link fixes.  http://wordpress.org/support/6/6979

Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** template-functions-links.php	6 Jun 2004 02:02:27 -0000	1.18
--- template-functions-links.php	7 Jun 2004 04:41:06 -0000	1.19
***************
*** 336,343 ****
  
     $home_root = str_replace('http://', '', trim(get_settings('home')));
     $home_root = preg_replace('|/+|i', '/', $home_root);
!    $qstr = str_replace($home_root . '/', '', $qstr);
     $qstr = preg_replace('|^/+|', '', $qstr);
!    return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . trailingslashit($qstr) );
  }
  
--- 336,345 ----
  
     $home_root = str_replace('http://', '', trim(get_settings('home')));
+    $home_root = preg_replace('|([^/]*)(.*)|i', '$2', $home_root);
     $home_root = preg_replace('|/+|i', '/', $home_root);
!    $home_root = trailingslashit($home_root);
!    $qstr = preg_replace('|^'. $home_root . '|', '', $qstr);
     $qstr = preg_replace('|^/+|', '', $qstr);
!    return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
  }