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

More whitespace & coding stadards cleanup 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-03-06 05:57:24 +00:00
parent 4917e5b375
commit 715188a970
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/load.php
View File

@ -48,9 +48,7 @@ function wp_fix_server_vars() {
// IIS Isapi_Rewrite // IIS Isapi_Rewrite
else if ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) { else if ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL']; $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
} } else {
else
{
// Use ORIG_PATH_INFO if there is no PATH_INFO // Use ORIG_PATH_INFO if there is no PATH_INFO
if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) ) if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO']; $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
@ -81,7 +79,7 @@ function wp_fix_server_vars() {
// Fix empty PHP_SELF // Fix empty PHP_SELF
$PHP_SELF = $_SERVER['PHP_SELF']; $PHP_SELF = $_SERVER['PHP_SELF'];
if ( empty( $PHP_SELF ) ) if ( empty( $PHP_SELF ) )
$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( "/(\?.*)?$/",'',$_SERVER["REQUEST_URI"] ); $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
} }
/** /**
@ -111,11 +109,11 @@ function wp_check_php_mysql_versions() {
* @since 3.0.0 * @since 3.0.0
*/ */
function wp_favicon_request() { function wp_favicon_request() {
if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) { if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
header('Content-Type: image/vnd.microsoft.icon'); header('Content-Type: image/vnd.microsoft.icon');
header('Content-Length: 0'); header('Content-Length: 0');
exit; exit;
} }
} }
/** /**
@ -532,9 +530,9 @@ function shutdown_action_hook() {
*/ */
function wp_clone( $object ) { function wp_clone( $object ) {
static $can_clone; static $can_clone;
if ( !isset( $can_clone ) ) { if ( !isset( $can_clone ) )
$can_clone = version_compare( phpversion(), '5.0', '>=' ); $can_clone = version_compare( phpversion(), '5.0', '>=' );
}
return $can_clone ? clone( $object ) : $object; return $can_clone ? clone( $object ) : $object;
} }