[wp-cvs] wordpress/wp-includes classes.php,1.50,1.51

[Ryan Boren]

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

Modified Files:
	classes.php 
Log Message:
Use parse_url instead of regex wackiness.

Index: classes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** classes.php	1 Feb 2005 06:20:54 -0000	1.50
--- classes.php	1 Feb 2005 07:05:00 -0000	1.51
***************
*** 1155,1166 ****
  		}
  
! 		$site_root = str_replace('http://', '', trim(get_settings('siteurl')));
! 		$site_root = preg_replace('|([^/]*)(.*)|i', '$2', $site_root);
! 		if ('/' != substr($site_root, -1)) $site_root = $site_root . '/';
!     
! 		$home_root = str_replace('http://', '', trim(get_settings('home')));
! 		$home_root = preg_replace('|([^/]*)(.*)|i', '$2', $home_root);
! 		if ('/' != substr($home_root, -1)) $home_root = $home_root . '/';
  
  		$rules = "<IfModule mod_rewrite.c>\n";
  		$rules .= "RewriteEngine On\n";
--- 1155,1164 ----
  		}
  
! 		$site_root = parse_url(get_settings('siteurl'));
! 		$site_root = trailingslashit($site_root['path']);
  
+ 		$home_root = parse_url(get_settings('home'));
+ 		$home_root = trailingslashit($home_root['path']);
+     
  		$rules = "<IfModule mod_rewrite.c>\n";
  		$rules .= "RewriteEngine On\n";