[wp-cvs] wordpress/wp-includes functions.php,1.155,1.156

[Ryan Boren]

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

Modified Files:
	functions.php 
Log Message:
Apache 1.3 does not support the reluctant (non-greedy) expression modifier.  Remove the modifier when outputting mod_rewrite rules.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** functions.php	5 Sep 2004 01:50:39 -0000	1.155
--- functions.php	7 Sep 2004 00:01:19 -0000	1.156
***************
*** 1332,1336 ****
  
          if ($post) {
!             $post_rewrite = array($trackbackmatch => $trackbackquery) + $post_rewrite;
          }
      }
--- 1332,1337 ----
  
          if ($post) {
!             $post_rewrite = array($trackbackmatch =top
! > $trackbackquery) + $post_rewrite;
          }
      }
***************
*** 1443,1446 ****
--- 1444,1450 ----
      $rewrite = rewrite_rules('', $permalink_structure);
      foreach ($rewrite as $match => $query) {
+ 			// Apache 1.3 does not support the reluctant (non-greedy) modifier.
+ 			$match = str_replace('.+?', '.+', $match);
+ 
          if (strstr($query, 'index.php')) {
              $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA]\n";