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

Fix invalid paths in requires. See r14139. See #12594 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-04-18 09:51:19 +00:00
parent 452057154f
commit f7e764312b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/compat.php
View File

@ -129,7 +129,7 @@ if ( !function_exists('json_encode') ) {
global $wp_json; global $wp_json;
if ( !is_a($wp_json, 'Services_JSON') ) { if ( !is_a($wp_json, 'Services_JSON') ) {
require_once( './class-json.php' ); require_once( ABSPATH . WPINC . '/class-json.php' );
$wp_json = new Services_JSON(); $wp_json = new Services_JSON();
} }
@ -142,7 +142,7 @@ if ( !function_exists('json_decode') ) {
global $wp_json; global $wp_json;
if ( !is_a($wp_json, 'Services_JSON') ) { if ( !is_a($wp_json, 'Services_JSON') ) {
require_once( './class-json.php' ); require_once( ABSPATH . WPINC . '/class-json.php' );
$wp_json = new Services_JSON(); $wp_json = new Services_JSON();
} }

4
wp-includes/media.php
View File

@ -1337,7 +1337,7 @@ function wp_expand_dimensions( $example_width, $example_height, $max_width, $max
* @return string The original URL on failure or the embed HTML on success. * @return string The original URL on failure or the embed HTML on success.
*/ */
function wp_oembed_get( $url, $args = '' ) { function wp_oembed_get( $url, $args = '' ) {
require_once( './class-oembed.php' ); require_once( ABSPATH . WPINC . '/class-oembed.php' );
$oembed = _wp_oembed_get_object(); $oembed = _wp_oembed_get_object();
return $oembed->get_html( $url, $args ); return $oembed->get_html( $url, $args );
} }
@ -1355,7 +1355,7 @@ function wp_oembed_get( $url, $args = '' ) {
* @param boolean $regex Whether the $format parameter is in a regex format. * @param boolean $regex Whether the $format parameter is in a regex format.
*/ */
function wp_oembed_add_provider( $format, $provider, $regex = false ) { function wp_oembed_add_provider( $format, $provider, $regex = false ) {
require_once( './class-oembed.php' ); require_once( ABSPATH . WPINC . '/class-oembed.php' );
$oembed = _wp_oembed_get_object(); $oembed = _wp_oembed_get_object();
$oembed->providers[$format] = array( $provider, $regex ); $oembed->providers[$format] = array( $provider, $regex );
} }