Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't include HTML in gettext call. Props nbachiyski and Nazgul. fixes #4437 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rob1n 2007-06-12 21:48:55 +00:00
parent b26a66ced0
commit e3328ca20b
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/widgets.php
View File

@ -860,7 +860,7 @@ function wp_widget_rss($args, $number = 1) {
echo "<li><a class='rsswidget' href='$link' title='$desc'>$title</a>$summary</li>";
}
} else {
echo __('<li>An error has occured; the feed is probably down. Try again later.</li>');
echo '<li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li>';
}
?>
</ul>

32
wp-settings.php
View File

@ -1,28 +1,26 @@
<?php
// Turn register globals off
function wp_unregister_GLOBALS() {
if ( !ini_get('register_globals') )
return;
if ( isset($_REQUEST['GLOBALS']) )
die('GLOBALS overwrite attempt detected');
// Variables that shouldn't be unset
$noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
foreach ( $input as $k => $v )
if ( !in_array($k, $noUnset) && isset($GLOBALS[$k]) ) {
if ( ini_get( 'register_globals' ) ) {
if ( isset( $_REQUEST['GLOBALS'] ) ) {
die( 'GLOBALS overwrite attempt detected. Exiting.' );
}
$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, is_array( $_SESSION ) ? $_SESSION : array() );
foreach ( $input as $key => $val ) {
if ( !in_array( $key, $no_unset ) && isset( $GLOBALS[$k] ) ) {
$GLOBALS[$k] = NULL;
unset($GLOBALS[$k]);
unset( $GLOBALS[$key] );
}
}
unset( $no_unset, $input );
}
wp_unregister_GLOBALS();
unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories );
if ( ! isset($blog_id) )
if ( !isset( $blog_id ) )
$blog_id = 1;
// Fix for IIS, which doesn't set REQUEST_URI