Skip to:
Content

bbPress.org

Changeset 6284


Ignore:
Timestamp:
02/03/2017 08:36:09 PM (9 years ago)
Author:
johnjamesjacoby
Message:

General: Remove () around require construct calls, and breathing room around some ! usages.

Location:
trunk/src/includes
Files:
17 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/includes/admin/admin.php

    r6282 r6284  
    130130        require $this->admin_dir . 'converter.php';
    131131        require $this->admin_dir . 'settings.php';
    132         require $this->admin_dir . 'functions.php';
     132        require $this->admin_dir . 'common.php';
    133133        require $this->admin_dir . 'metaboxes.php';
    134134        require $this->admin_dir . 'forums.php';
    … …  
    465465
    466466        // Leave if we're not in the import section
    467         if ( !defined( 'WP_LOAD_IMPORTERS' ) ) {
     467        if ( ! defined( 'WP_LOAD_IMPORTERS' ) ) {
    468468            return;
    469469        }
    470470
    471471        // Load Importer API
    472         require_once( ABSPATH . 'wp-admin/includes/import.php' );
     472        require_once ABSPATH . 'wp-admin/includes/import.php';
    473473
    474474        // Load our importers
    … …  
    486486            // If the file exists, include it
    487487            if ( file_exists( $import_file ) ) {
    488                 require( $import_file );
     488                require $import_file;
    489489            }
    490490        }

  • trunk/src/includes/admin/classes/class-bbp-topic-replies-list-table.php

    r6271 r6284  
    1414// Include the main list table class if it's not included yet
    1515if ( ! class_exists( 'WP_List_Table' ) ) {
    16     require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
     16    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
    1717}
    1818

  • trunk/src/includes/admin/converter.php

    r6195 r6284  
    640640        }
    641641
    642         require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
     642        require_once ABSPATH . '/wp-admin/includes/upgrade.php';
    643643
    644644        if ( ! empty( $bbp_db->charset ) ) {
    … …  
    17801780
    17811781    protected function callback_html( $field ) {
    1782         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     1782        require_once bbpress()->admin->admin_dir . 'parser.php';
    17831783        $bbcode = BBCode::getInstance();
    17841784        return html_entity_decode( $bbcode->Parse( $field ) );
    … …  
    18261826
    18271827    if ( true === $found ) {
    1828         require_once( bbpress()->admin->admin_dir . 'converters/' . $platform . '.php' );
     1828        require_once bbpress()->admin->admin_dir . 'converters/' . $platform . '.php';
    18291829        return new $platform;
    18301830    } else {

  • trunk/src/includes/admin/converters/Invision.php

    r5951 r6284  
    629629        $field = $invision_markup;
    630630
    631         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     631        require_once bbpress()->admin->admin_dir . 'parser.php';
    632632        $bbcode = BBCode::getInstance();
    633633        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/Mingle.php

    r6115 r6284  
    479479     */
    480480    protected function callback_html( $field ) {
    481         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     481        require_once bbpress()->admin->admin_dir . 'parser.php';
    482482        $bbcode = BBCode::getInstance();
    483483        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/SMF.php

    r5951 r6284  
    807807
    808808        // Parse out any bbCodes in $field with the BBCode 'parser.php'
    809         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     809        require_once bbpress()->admin->admin_dir . 'parser.php';
    810810        $bbcode = BBCode::getInstance();
    811811        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/SimplePress5.php

    r5951 r6284  
    608608
    609609        // Parse out any bbCodes with the BBCode 'parser.php'
    610         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     610        require_once bbpress()->admin->admin_dir . 'parser.php';
    611611        $bbcode = BBCode::getInstance();
    612612        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/Vanilla.php

    r6115 r6284  
    607607     */
    608608    protected function callback_html( $field ) {
    609         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     609        require_once bbpress()->admin->admin_dir . 'parser.php';
    610610        $bbcode = BBCode::getInstance();
    611611        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/XenForo.php

    r6001 r6284  
    845845
    846846        // Parse out any bbCodes in $field with the BBCode 'parser.php'
    847         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     847        require_once bbpress()->admin->admin_dir . 'parser.php';
    848848        $bbcode = BBCode::getInstance();
    849849        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/bbPress1.php

    r5951 r6284  
    762762     */
    763763    protected function callback_html( $field ) {
    764         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     764        require_once bbpress()->admin->admin_dir . 'parser.php';
    765765        $bbcode = BBCode::getInstance();
    766766        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/e107v1.php

    r6196 r6284  
    632632
    633633        // Parse out any bbCodes in $field with the BBCode 'parser.php'
    634         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     634        require_once bbpress()->admin->admin_dir . 'parser.php';
    635635        $bbcode = BBCode::getInstance();
    636636        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/phpBB.php

    r5951 r6284  
    10201020
    10211021        // Parse out any bbCodes in $field with the BBCode 'parser.php'
    1022         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     1022        require_once bbpress()->admin->admin_dir . 'parser.php';
    10231023        $bbcode = BBCode::getInstance();
    10241024        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/vBulletin.php

    r5951 r6284  
    748748
    749749        // Parse out any bbCodes in $field with the BBCode 'parser.php'
    750         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     750        require_once bbpress()->admin->admin_dir . 'parser.php';
    751751        $bbcode = BBCode::getInstance();
    752752        $bbcode->enable_smileys = false;

  • trunk/src/includes/admin/converters/vBulletin3.php

    r5951 r6284  
    746746
    747747        // Parse out any bbCodes in $field with the BBCode 'parser.php'
    748         require_once( bbpress()->admin->admin_dir . 'parser.php' );
     748        require_once bbpress()->admin->admin_dir . 'parser.php';
    749749        $bbcode = BBCode::getInstance();
    750750        $bbcode->enable_smileys = false;

  • trunk/src/includes/core/extend.php

    r5951 r6284  
    2424
    2525    // Bail if no akismet
    26     if ( !defined( 'AKISMET_VERSION' ) ) {
     26    if ( ! defined( 'AKISMET_VERSION' ) ) {
    2727        return;
    2828    }
    … …  
    3434
    3535    // Include the Akismet Component
    36     require( bbpress()->includes_dir . 'extend/akismet.php' );
     36    require_once bbpress()->includes_dir . 'extend/akismet.php';
    3737
    3838    // Instantiate Akismet for bbPress
    … …  
    7070
    7171    // Include the BuddyPress Component
    72     require( bbpress()->includes_dir . 'extend/buddypress/loader.php' );
     72    require_once bbpress()->includes_dir . 'extend/buddypress/loader.php';
    7373
    7474    // Instantiate BuddyPress for bbPress

  • trunk/src/includes/extend/buddypress/loader.php

    r6250 r6284  
    9090
    9191        // Define the parent forum ID
    92         if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ) {
     92        if ( ! defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ) {
    9393            define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
    9494        }
    9595
    9696        // Define a slug, if necessary
    97         if ( !defined( 'BP_FORUMS_SLUG' ) ) {
     97        if ( ! defined( 'BP_FORUMS_SLUG' ) ) {
    9898            define( 'BP_FORUMS_SLUG', $this->id );
    9999        }

  • trunk/src/includes/users/functions.php

    r6219 r6284  
    21772177
    21782178/**
    2179  * Convert passwords from previous platfrom encryption to WordPress encryption.
     2179 * Convert passwords from previous platform encryption to WordPress encryption.
    21802180 *
    21812181 * @since 2.1.0 bbPress (r3813)
    … …  
    22022202
    22032203    // Setup admin (to include converter)
    2204     require_once( bbpress()->includes_dir . 'admin/admin.php' );
     2204    require_once bbpress()->includes_dir . 'admin/admin.php';
    22052205
    22062206    // Create the admin object
    … …  
    22082208
    22092209    // Convert password
    2210     require_once( bbpress()->admin->admin_dir . 'converter.php' );
    2211     require_once( bbpress()->admin->admin_dir . 'converters/' . $row->meta_value . '.php' );
     2210    require_once bbpress()->admin->admin_dir . 'converter.php';
     2211    require_once bbpress()->admin->admin_dir . 'converters/' . sanitize_key( $row->meta_value ) . '.php';
    22122212
    22132213    // Create the converter
Note: See TracChangeset for help on using the changeset viewer.