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

Define wp_clone() before loading the cache. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-15 19:14:43 +00:00
parent ba31bedcae
commit d2110af1b9
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/functions.php
View File

@ -3030,24 +3030,6 @@ function wp_suspend_cache_invalidation($suspend = true) {
return $current_suspend; return $current_suspend;
} }
/**
* Copy an object.
*
* Returns a cloned copy of an object.
*
* @since 2.7.0
*
* @param object $object The object to clone
* @return object The cloned object
*/
function wp_clone( $object ) {
static $can_clone;
if ( !isset( $can_clone ) ) {
$can_clone = version_compare( phpversion(), '5.0', '>=' );
}
return $can_clone ? clone( $object ) : $object;
}
function get_site_option( $key, $default = false, $use_cache = true ) { function get_site_option( $key, $default = false, $use_cache = true ) {
return get_option($key, $default); return get_option($key, $default);
} }

18
wp-settings.php
View File

@ -270,6 +270,24 @@ $prefix = $wpdb->set_prefix($table_prefix);
if ( is_wp_error($prefix) ) if ( is_wp_error($prefix) )
wp_die(/*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/); wp_die(/*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/);
/**
* Copy an object.
*
* Returns a cloned copy of an object.
*
* @since 2.7.0
*
* @param object $object The object to clone
* @return object The cloned object
*/
function wp_clone( $object ) {
static $can_clone;
if ( !isset( $can_clone ) ) {
$can_clone = version_compare( phpversion(), '5.0', '>=' );
}
return $can_clone ? clone( $object ) : $object;
}
if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) { if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
require_once (WP_CONTENT_DIR . '/object-cache.php'); require_once (WP_CONTENT_DIR . '/object-cache.php');
$_wp_using_ext_object_cache = true; $_wp_using_ext_object_cache = true;