Skip to content
Snippets Groups Projects
Commit e49d5f04 authored by lobo's avatar lobo
Browse files

fixed old commit breaking tests on default-constants.php

get_option('siteurl') will be used used instead  site_url('wp-content') to populate WP_CONTENT_URL
parent 5b004c8a
Branches
Tags noblogs-5.6
1 merge request!3Noblogs 5.4
......@@ -148,16 +148,11 @@ function wp_initial_constants() {
* @since 3.0.0
*/
function wp_plugin_directory_constants() {
<<<<<<< HEAD
if ( ! defined( 'WP_CONTENT_URL' ) ) {
define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' ); // Full URL - WP_CONTENT_DIR is defined further up.
}
=======
// patched by lesion [http://core.trac.wordpress.org/ticket/13941]
if ( !defined('WP_CONTENT_URL') )
define( 'WP_CONTENT_URL', site_url('wp-content' ) );
#define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
>>>>>>> d2e28098a... Initial commit
/**
* Allows for the plugins directory to be moved from the default location.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment