common/includes/slack/trac/config.php | 2 +- .../plugins/camptix-badge-generator/includes/indesign-badges.php | 2 +- .../wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php | 8 ++++---- .../plugins/plugin-directory/bin/import-plugin-to-glotpress.php | 4 ++-- .../wp-content/plugins/plugin-directory/bin/import-plugin.php | 4 ++-- .../wp-content/plugins/plugin-directory/bin/rebuild-zip.php | 4 ++-- .../plugins/plugin-directory/standalone/plugins-info-api.php | 2 +- .../public_html/wp-content/themes/pub/wporg-forums/functions.php | 2 +- .../public_html/wp-content/themes/pub/wporg-showcase/header.php | 2 +- .../wp-content/themes/pub/wporg-showcase/js/fancyzoomhtml.js | 4 ++-- .../public_html/wp-content/themes/pub/wporg-support/functions.php | 2 +- wordpress.org/public_html/wp-content/themes/pub/wporg/search.php | 4 ++++ .../wptv2/plugins/wordpresstv-unisubs/wordpresstv-unisubs.php | 2 +- 13 files changed, 23 insertions(+), 19 deletions(-) diff --git a/common/includes/slack/trac/config.php b/common/includes/slack/trac/config.php index ca46ad5a..782cecea 100644 --- a/common/includes/slack/trac/config.php +++ b/common/includes/slack/trac/config.php @@ -17,7 +17,7 @@ class Core extends Trac { * Start regex matches with # as your delimiter. */ protected $commit_path_filters = array( - 'wp-content/themes' => '#core-themes', + 'wp-content-old/themes' => '#core-themes', 'customize' => '#core-customize', 'editor-expand.js' => '#core-editor', 'wp-admin/css/edit.css' => '#core-editor', diff --git a/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php b/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php index def8a6a7..e33738f0 100644 --- a/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php +++ b/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php @@ -441,7 +441,7 @@ function create_zip_file( $zip_filename, $zip_local_folder, $csv_filename, $grav /** * Serve the Zip file for downloading * - * Security: This is intentionally served through PHP instead of making it accessible directly through wp-content, + * Security: This is intentionally served through PHP instead of making it accessible directly through wp-content-old, * because the CSV file contains email addresses that we don't want to risk exposing to anyone scraping public * folders. * diff --git a/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php b/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php index 26fc4daa..9e8de792 100644 --- a/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php +++ b/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php @@ -288,14 +288,14 @@ class WordCamp_New_Site { */ public function _fix_wc_upload_dir( $data ) { $data['path'] = str_replace( - 'public_html/mu/wp-content', - 'public_html/wp-content', + 'public_html/mu/wp-content-old', + 'public_html/wp-content-old', $data['path'] ); $data['basedir'] = str_replace( - 'public_html/mu/wp-content', - 'public_html/wp-content', + 'public_html/mu/wp-content-old', + 'public_html/wp-content-old', $data['basedir'] ); diff --git a/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php b/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php index 97b3f236..a71b027b 100644 --- a/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php +++ b/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php @@ -19,8 +19,8 @@ if ( empty( $opts ) && $argc == 2 ) { if ( empty( $opts['url'] ) ) { $opts['url'] = 'https://wordpress.org/plugins/'; } -if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) { - $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) ); +if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content-old' ) ) { + $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content-old' ) ); } foreach ( array( 'url', 'abspath', 'plugin', 'tag', 'type' ) as $opt ) { diff --git a/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin.php b/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin.php index a6d166d2..3f694805 100644 --- a/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin.php +++ b/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin.php @@ -18,8 +18,8 @@ if ( empty( $opts ) && $argc == 2 ) { if ( empty( $opts['url'] ) ) { $opts['url'] = 'https://wordpress.org/plugins/'; } -if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) { - $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) ); +if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content-old' ) ) { + $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content-old' ) ); } if ( empty( $opts['changed-tags'] ) ) { diff --git a/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php b/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php index b6dbe27a..6c50aed4 100644 --- a/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php +++ b/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php @@ -27,8 +27,8 @@ if ( empty( $opts ) && $argc == 3 ) { if ( empty( $opts['url'] ) ) { $opts['url'] = 'https://wordpress.org/plugins/'; } -if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) { - $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) ); +if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content-old' ) ) { + $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content-old' ) ); } if ( empty( $opts['versions'] ) ) { $opts['versions'] = ''; diff --git a/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/plugins-info-api.php b/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/plugins-info-api.php index 27a087a3..ee2d13d5 100644 --- a/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/plugins-info-api.php +++ b/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/plugins-info-api.php @@ -7,7 +7,7 @@ die(); * It makes a lot of assumptions about the environment under which WordPress might be installed in. */ -// Assume a standard wp-content/plugins/ plugin directory. +// Assume a standard wp-content-old/plugins/ plugin directory. define( 'WPORGPATH', dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/' ); $_REQUEST = array( diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php index 52fcfecc..afc1a0b2 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php @@ -22,7 +22,7 @@ function wporg_support_scripts() { wp_register_style( 'bb-base', - '//bbpress.org/wp-content/themes/bb-base/style.css', + '//bbpress.org/wp-content-old/themes/bb-base/style.css', array(), '20160929' ); diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php index 16e5ec1a..b10997fe 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php @@ -3,7 +3,7 @@ $GLOBALS['pagetitle'] = wp_get_document_title(); $prefix = is_ssl() ? 'https://' : 'http://s.'; wp_enqueue_style( 'blog-wp4', $prefix.'wordpress.org/style/blog-wp4.css', array(), 4 ); -wp_enqueue_style( 'showcase', $prefix.'wordpress.org/wp-content/themes/pub/wporg-showcase/style.css', array(), 14 ); +wp_enqueue_style( 'showcase', $prefix.'wordpress.org/wp-content-old/themes/pub/wporg-showcase/style.css', array(), 14 ); require WPORGPATH . 'header.php'; ?>
diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/js/fancyzoomhtml.js b/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/js/fancyzoomhtml.js index 1a30c818..2055dcef 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/js/fancyzoomhtml.js +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/js/fancyzoomhtml.js @@ -29,9 +29,9 @@ function insertZoomHTML() { // ZOOM IMAGE // //
- // + // //
- // + // //
//
diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php b/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php index aab0c782..59ea4de4 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php @@ -22,7 +22,7 @@ function wporg_support_scripts() { wp_register_style( 'bb-base', - '//bbpress.org/wp-content/themes/bb-base/style.css', + '//bbpress.org/wp-content-old/themes/bb-base/style.css', array(), '20160919' ); diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg/search.php b/wordpress.org/public_html/wp-content/themes/pub/wporg/search.php index da96e10d..f39831a4 100644 --- a/wordpress.org/public_html/wp-content/themes/pub/wporg/search.php +++ b/wordpress.org/public_html/wp-content/themes/pub/wporg/search.php @@ -2,6 +2,10 @@ /** * The template for displaying search results pages. * + * This is the template that displays search result. + * + * @link https://codex.wordpress.org/Template_Hierarchy + * * @package WordPressdotorg\Theme */ diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-unisubs/wordpresstv-unisubs.php b/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-unisubs/wordpresstv-unisubs.php index b3b5d7f8..9ef33751 100644 --- a/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-unisubs/wordpresstv-unisubs.php +++ b/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-unisubs/wordpresstv-unisubs.php @@ -141,7 +141,7 @@ class WordCampTV_Unisubs { $data['width'] = absint( $width ); $data['height'] = absint( $height ); $data['duration'] = absint( $info->duration ); - $data['swf'] = esc_url_raw( sprintf( 'http://v.wordpress.com/wp-content/plugins/video/assets/player.wptv.swf?guid=%s', $info->guid ) ); + $data['swf'] = esc_url_raw( sprintf( 'http://v.wordpress.com/wp-content-old/plugins/video/assets/player.wptv.swf?guid=%s', $info->guid ) ); // Redirect to the SWF file if we need to. if ( isset( $_GET['redirect_to_swf'] ) ) {