Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Eliminate a string in options-permalink and end strings with full stops. fixes #19472.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-12-20 21:15:13 +00:00
parent 0fd8ef6b71
commit e8b954fe7d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/options-permalink.php
View File

@ -148,11 +148,11 @@ if (isset($_POST['submit'])) : ?>
if ( ! is_multisite() ) { if ( ! is_multisite() ) {
if ( $iis7_permalinks ) { if ( $iis7_permalinks ) {
if ( $permalink_structure && ! $usingpi && ! $writable ) if ( $permalink_structure && ! $usingpi && ! $writable )
_e('You should update your web.config now'); _e('You should update your web.config now.');
else if ( $permalink_structure && ! $usingpi && $writable ) else if ( $permalink_structure && ! $usingpi && $writable )
_e('Permalink structure updated. Remove write access on web.config file now!'); _e('Permalink structure updated. Remove write access on web.config file now!');
else else
_e('Permalink structure updated'); _e('Permalink structure updated.');
} else { } else {
if ( $permalink_structure && ! $usingpi && ! $writable ) if ( $permalink_structure && ! $usingpi && ! $writable )
_e('You should update your .htaccess now.'); _e('You should update your .htaccess now.');
@ -226,11 +226,14 @@ $structures = array(
</table> </table>
<h3><?php _e('Optional'); ?></h3> <h3><?php _e('Optional'); ?></h3>
<?php if ( $is_apache || $iis7_permalinks ) : ?> <?php
<p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <kbd>topics</kbd> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p> $suffix = '';
<?php else : ?> if ( ! $is_apache && ! $iis7_permalinks )
<p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p> $suffix = 'index.php/';
<?php endif; ?> ?>
<p><?php
/* translators: %s is a placeholder that must come at the start of the URL path. */
printf( __('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/%stopics/uncategorized/</code>. If you leave these blank the defaults will be used.'), $suffix ); ?></p>
<table class="form-table"> <table class="form-table">
<tr> <tr>