Skip to:
Content

BuddyPress.org

Changeset 5574


Ignore:
Timestamp:
12/19/2011 10:48:35 PM (12 years ago)
Author:
djpaul
Message:

Fix a bunch of URLs containing double forward slashes. See #3779

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/admin/bp-core-functions.php

    r5524 r5574  
    389389function bp_core_add_admin_menu_styles() {
    390390    if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    391         wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', BP_PLUGIN_URL . '/bp-core/css/admin.dev.css' ), array(), '20110723' );
     391        wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', BP_PLUGIN_URL . 'bp-core/css/admin.dev.css' ), array(), '20110723' );
    392392    else
    393         wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', BP_PLUGIN_URL . '/bp-core/css/admin.css' ), array(), '20110723' );
     393        wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', BP_PLUGIN_URL . 'bp-core/css/admin.css' ), array(), '20110723' );
    394394
    395395    wp_enqueue_script( 'thickbox' );
  • trunk/bp-core/bp-core-avatars.php

    r5479 r5574  
    4040
    4141    if ( !defined( 'BP_AVATAR_DEFAULT' ) )
    42         define( 'BP_AVATAR_DEFAULT', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
     42        define( 'BP_AVATAR_DEFAULT', BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg' );
    4343
    4444    if ( !defined( 'BP_AVATAR_DEFAULT_THUMB' ) )
    45         define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-core/images/mystery-man-50.jpg' );
     45        define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . 'bp-core/images/mystery-man-50.jpg' );
    4646}
    4747add_action( 'bp_init', 'bp_core_set_avatar_constants', 3 );
     
    355355    // No avatar was found, and we've been told not to use a gravatar.
    356356    } else {
    357         $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg', $params );
     357        $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg', $params );
    358358    }
    359359
  • trunk/bp-core/bp-core-buddybar.php

    r5559 r5574  
    636636        $stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
    637637    elseif ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    638         $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.dev.css';
     638        $stylesheet = BP_PLUGIN_URL . 'bp-core/css/buddybar.dev.css';
    639639    else
    640         $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.css';
     640        $stylesheet = BP_PLUGIN_URL . 'bp-core/css/buddybar.css';
    641641
    642642    wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array(), '20110723' );
     
    646646
    647647    if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    648         $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar-rtl.dev.css';
     648        $stylesheet = BP_PLUGIN_URL . 'bp-core/css/buddybar-rtl.dev.css';
    649649    else
    650         $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar-rtl.css';
     650        $stylesheet = BP_PLUGIN_URL . 'bp-core/css/buddybar-rtl.css';
    651651
    652652    wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
  • trunk/bp-core/bp-core-widgets.php

    r5564 r5574  
    2525        if ( is_active_widget( false, false, $this->id_base ) && !is_admin() && !is_network_admin() ) {
    2626            if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    27                 wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.dev.js', array( 'jquery' ), '20110723' );
     27                wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . 'bp-core/js/widget-members.dev.js', array( 'jquery' ), '20110723' );
    2828            else
    29                 wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array( 'jquery' ), '20110723' );
     29                wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . 'bp-core/js/widget-members.js', array( 'jquery' ), '20110723' );
    3030        }
    3131    }
  • trunk/bp-forums/bp-forums-admin.php

    r5429 r5574  
    268268    $file .= "\n" .   '$bb->custom_user_table = \'' . $wpdb->users . '\';';
    269269    $file .= "\n" .   '$bb->custom_user_meta_table = \'' . $wpdb->usermeta . '\';';
    270     $file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . '/bp-forums/bbpress/\';';
     270    $file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . 'bp-forums/bbpress/\';';
    271271    $file .= "\n" .   '$bb->name = \'' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
    272272
  • trunk/bp-forums/bp-forums-bbpress-sa.php

    r5117 r5574  
    1717    define( 'BB_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/' );
    1818    define( 'BACKPRESS_PATH', BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-includes/backpress/' );
    19     define( 'BB_URL', BP_PLUGIN_URL . '/bp-forums/bbpress/' );
     19    define( 'BB_URL', BP_PLUGIN_URL . 'bp-forums/bbpress/' );
    2020    define( 'BB_INC', 'bb-includes/' );
    2121
  • trunk/bp-groups/bp-groups-widgets.php

    r5564 r5574  
    2222        if ( is_active_widget( false, false, $this->id_base ) && !is_admin() && !is_network_admin() ) {
    2323            if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    24                 wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.dev.js', array( 'jquery' ) );
     24                wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . 'bp-groups/js/widget-groups.dev.js', array( 'jquery' ) );
    2525            else
    26                 wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array( 'jquery' ) );
     26                wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . 'bp-groups/js/widget-groups.js', array( 'jquery' ) );
    2727        }
    2828    }
  • trunk/bp-members/bp-members-template.php

    r5466 r5574  
    11221122                $default_grav = 'wavatar';
    11231123            else if ( 'mystery' == $bp->grav_default->user )
    1124                 $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
     1124                $default_grav = BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg';
    11251125            else
    11261126                $default_grav = $bp->grav_default->user;
  • trunk/bp-messages/bp-messages-cssjs.php

    r4825 r5574  
    1111
    1212        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
    13             wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocomplete.dev.js', array( 'jquery' ), '20110723' );
    14             wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocompletefb.dev.js', array(), '20110723' );
    15             wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.bgiframe.dev.js', array(), '20110723' );
    16             wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.dimensions.dev.js', array(), '20110723' );
     13            wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocomplete.dev.js', array( 'jquery' ), '20110723' );
     14            wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocompletefb.dev.js', array(), '20110723' );
     15            wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.bgiframe.dev.js', array(), '20110723' );
     16            wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.dimensions.dev.js', array(), '20110723' );
    1717
    1818        } else {
    19             wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocomplete.js', array( 'jquery' ), '20110723' );
    20             wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocompletefb.js', array(), '20110723' );
    21             wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.bgiframe.js', array(), '20110723' );
    22             wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.dimensions.js', array(), '20110723' );
     19            wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocomplete.js', array( 'jquery' ), '20110723' );
     20            wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.autocompletefb.js', array(), '20110723' );
     21            wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.bgiframe.js', array(), '20110723' );
     22            wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . 'bp-messages/js/autocomplete/jquery.dimensions.js', array(), '20110723' );
    2323        }
    2424    }
     
    3131    if ( bp_is_messages_component() && bp_is_current_action( 'compose' ) ) {
    3232        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    33             wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . '/bp-messages/css/autocomplete/jquery.autocompletefb.dev.css', array(), '20110723' );
     33            wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . 'bp-messages/css/autocomplete/jquery.autocompletefb.dev.css', array(), '20110723' );
    3434        else
    35             wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . '/bp-messages/css/autocomplete/jquery.autocompletefb.css', array(), '20110723' );
     35            wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . 'bp-messages/css/autocomplete/jquery.autocompletefb.css', array(), '20110723' );
    3636
    3737        wp_print_styles();
  • trunk/bp-xprofile/bp-xprofile-cssjs.php

    r5525 r5574  
    77    if ( !empty( $_GET['page'] ) && strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
    88        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    9             wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.dev.css', array(), $version );
     9            wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . 'bp-xprofile/admin/css/admin.dev.css', array(), $version );
    1010        else
    11             wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css',     array(), $version );
     11            wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . 'bp-xprofile/admin/css/admin.css',     array(), $version );
    1212    }
    1313}
     
    2525        $version = '20111212';
    2626        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
    27             wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.dev.js', array( 'jquery', 'jquery-ui-sortable' ), $version );
     27            wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . 'bp-xprofile/admin/js/admin.dev.js', array( 'jquery', 'jquery-ui-sortable' ), $version );
    2828        else
    29             wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js',     array( 'jquery', 'jquery-ui-sortable' ), $version );
     29            wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . 'bp-xprofile/admin/js/admin.js',     array( 'jquery', 'jquery-ui-sortable' ), $version );
    3030    }
    3131}
Note: See TracChangeset for help on using the changeset viewer.