From e49d5f04c7b89634143fdac1db9f3ff94bd7e98d Mon Sep 17 00:00:00 2001
From: lobo <lobo@autistici.org>
Date: Thu, 16 Apr 2020 14:08:33 +0000
Subject: [PATCH] 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
---
wp-includes/default-constants.php | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index cdd25d78f..040e06842 100644
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -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.
--
GitLab