[wp-cvs] wordpress/wp-admin options-permalink.php,1.32,1.33

[Ryan Boren]

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

Modified Files:
	options-permalink.php 
Log Message:
Revamp rewrite rule generation.  Add clean page links.  Credit to Jaykul for get_pagenum_link().

Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** options-permalink.php	23 May 2004 16:27:59 -0000	1.32
--- options-permalink.php	31 May 2004 17:22:24 -0000	1.33
***************
*** 126,135 ****
  $rules = '';
  foreach ($rewrite as $match => $query) {
! 	if (strstr($query, 'index.php')) $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA]\n";
!     $rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA]\n";
  }
  echo apply_filters('rewrite_rules', $rules);
  ?>
!     </textarea>
      </p>
      <?php printf(__('<p>If your <code>.htaccess</code> file is writable by WordPress, you can <a href="%s">edit it through your template interface</a>.</p>'), 'templates.php?file=.htaccess') ?>
--- 126,138 ----
  $rules = '';
  foreach ($rewrite as $match => $query) {
! 	if (strstr($query, 'index.php')) {
!         $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA]\n";
!     } else {
!         $rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA]\n";
!     }
  }
  echo apply_filters('rewrite_rules', $rules);
  ?>
! </textarea>
      </p>
      <?php printf(__('<p>If your <code>.htaccess</code> file is writable by WordPress, you can <a href="%s">edit it through your template interface</a>.</p>'), 'templates.php?file=.htaccess') ?>