WordPress.org
Get WordPress

Making WordPress.org

Ticket #3308: 3308.diff

File 3308.diff, 11.6 KB (added by ronakganatra, 7 years ago)

Added description in search.php as per description

  • common/includes/slack/trac/config.php 

     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 b class Core extends Trac { 
    1717         * Start regex matches with # as your delimiter.
    1818         */
    1919        protected $commit_path_filters = array(
    20                 'wp-content/themes'                => '#core-themes',
     20                'wp-content-old/themes'                => '#core-themes',
    2121                'customize'                        => '#core-customize',
    2222                'editor-expand.js'                 => '#core-editor',
    2323                'wp-admin/css/edit.css'            => '#core-editor',

  • wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/includes/indesign-badges.php 

    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 b function create_zip_file( $zip_filename, $zip_local_folder, $csv_filename, $grav 
    441441/**
    442442 * Serve the Zip file for downloading
    443443 *
    444  * Security: This is intentionally served through PHP instead of making it accessible directly through wp-content,
     444 * Security: This is intentionally served through PHP instead of making it accessible directly through wp-content-old,
    445445 * because the CSV file contains email addresses that we don't want to risk exposing to anyone scraping public
    446446 * folders.
    447447 *

  • wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php 

    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 b class WordCamp_New_Site { 
    288288         */
    289289        public function _fix_wc_upload_dir( $data ) {
    290290                $data['path'] = str_replace(
    291                         'public_html/mu/wp-content',
    292                         'public_html/wp-content',
     291                        'public_html/mu/wp-content-old',
     292                        'public_html/wp-content-old',
    293293                        $data['path']
    294294                );
    295295
    296296                $data['basedir'] = str_replace(
    297                         'public_html/mu/wp-content',
    298                         'public_html/wp-content',
     297                        'public_html/mu/wp-content-old',
     298                        'public_html/wp-content-old',
    299299                        $data['basedir']
    300300                );
    301301

  • wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin-to-glotpress.php 

    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 b if ( empty( $opts ) && $argc == 2 ) { 
    1919if ( empty( $opts['url'] ) ) {
    2020        $opts['url'] = 'https://wordpress.org/plugins/';
    2121}
    22 if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) {
    23         $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) );
     22if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content-old' ) ) {
     23        $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content-old' ) );
    2424}
    2525
    2626foreach ( array( 'url', 'abspath', 'plugin', 'tag', 'type' ) as $opt ) {

  • wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin.php 

    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 b if ( empty( $opts ) && $argc == 2 ) { 
    1818if ( empty( $opts['url'] ) ) {
    1919        $opts['url'] = 'https://wordpress.org/plugins/';
    2020}
    21 if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) {
    22         $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) );
     21if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content-old' ) ) {
     22        $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content-old' ) );
    2323}
    2424
    2525if ( empty( $opts['changed-tags'] ) ) {

  • wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php 

    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 b if ( empty( $opts ) && $argc == 3 ) { 
    2727if ( empty( $opts['url'] ) ) {
    2828        $opts['url'] = 'https://wordpress.org/plugins/';
    2929}
    30 if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) {
    31         $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) );
     30if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content-old' ) ) {
     31        $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content-old' ) );
    3232}
    3333if ( empty( $opts['versions'] ) ) {
    3434        $opts['versions'] = '';

  • wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/plugins-info-api.php 

    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 b die(); 
    77 * It makes a lot of assumptions about the environment under which WordPress might be installed in.
    88 */
    99
    10 // Assume a standard wp-content/plugins/ plugin directory.
     10// Assume a standard wp-content-old/plugins/ plugin directory.
    1111define( 'WPORGPATH', dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/' );
    1212
    1313$_REQUEST = array(

  • wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php 

    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 b function wporg_support_scripts() { 
    2222
    2323        wp_register_style(
    2424                'bb-base',
    25                 '//bbpress.org/wp-content/themes/bb-base/style.css',
     25                '//bbpress.org/wp-content-old/themes/bb-base/style.css',
    2626                array(),
    2727                '20160929'
    2828        );

  • wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php 

    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 b $GLOBALS['pagetitle'] = wp_get_document_title(); 
    33
    44$prefix = is_ssl() ? 'https://' : 'http://s.';
    55wp_enqueue_style( 'blog-wp4', $prefix.'wordpress.org/style/blog-wp4.css', array(), 4 );
    6 wp_enqueue_style( 'showcase', $prefix.'wordpress.org/wp-content/themes/pub/wporg-showcase/style.css', array(), 14 );
     6wp_enqueue_style( 'showcase', $prefix.'wordpress.org/wp-content-old/themes/pub/wporg-showcase/style.css', array(), 14 );
    77require WPORGPATH . 'header.php';
    88?>
    99<div id="headline">

  • wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/js/fancyzoomhtml.js 

    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 b function insertZoomHTML() { 
    2929        // ZOOM IMAGE
    3030        //
    3131        // <div id="ZoomBox">
    32         //   <a href="javascript:zoomOut();"><img src="/wp-content/themes/h4/i/zoom/spacer.gif" id="ZoomImage" border="0"></a> <!-- THE IMAGE -->
     32        //   <a href="javascript:zoomOut();"><img src="/wp-content-old/themes/h4/i/zoom/spacer.gif" id="ZoomImage" border="0"></a> <!-- THE IMAGE -->
    3333        //   <div id="ZoomClose">
    34         //       <a href="javascript:zoomOut();"><img src="/wp-content/themes/h4/i/zoom/closebox.png" width="30" height="30" border="0"></a>
     34        //       <a href="javascript:zoomOut();"><img src="/wp-content-old/themes/h4/i/zoom/closebox.png" width="30" height="30" border="0"></a>
    3535        //   </div>
    3636        // </div>
    3737       

  • wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php 

    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 b function wporg_support_scripts() { 
    2222
    2323        wp_register_style(
    2424                'bb-base',
    25                 '//bbpress.org/wp-content/themes/bb-base/style.css',
     25                '//bbpress.org/wp-content-old/themes/bb-base/style.css',
    2626                array(),
    2727                '20160919'
    2828        );

  • wordpress.org/public_html/wp-content/themes/pub/wporg/search.php 

    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 b  
    22/**
    33 * The template for displaying search results pages.
    44 *
     5 * This is the template that displays search result.
     6 *
     7 * @link https://codex.wordpress.org/Template_Hierarchy
     8 *
    59 * @package WordPressdotorg\Theme
    610 */
    711

  • wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-unisubs/wordpresstv-unisubs.php 

    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 b class WordCampTV_Unisubs { 
    141141                $data['width']    = absint( $width );
    142142                $data['height']   = absint( $height );
    143143                $data['duration'] = absint( $info->duration );
    144                 $data['swf']      = esc_url_raw( sprintf( 'http://v.wordpress.com/wp-content/plugins/video/assets/player.wptv.swf?guid=%s', $info->guid ) );
     144                $data['swf']      = esc_url_raw( sprintf( 'http://v.wordpress.com/wp-content-old/plugins/video/assets/player.wptv.swf?guid=%s', $info->guid ) );
    145145
    146146                // Redirect to the SWF file if we need to.
    147147                if ( isset( $_GET['redirect_to_swf'] ) ) {