Skip to:
Content

bbPress.org

Changeset 7056


Ignore:
Timestamp:
01/15/2020 10:13:55 PM (21 months ago)
Author:
netweb
Message:

General: fix a few typos.

Props passoniate, wpamitkumar, sharaz.
Fixes #3308, #3316, #3317, #3319, #3323.

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r6670 r7056  
    8989        );
    9090
    91         // Forum slug (Clean name to avoid confilcts)
     91        // Forum slug (Clean name to avoid conflicts)
    9292        $this->field_map[] = array(
    9393            'from_tablename'  => 'forums_table',

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

    r7050 r7056  
    9494        );
    9595
    96         // Forum slug (Clean name to avoid confilcts)
     96        // Forum slug (Clean name to avoid conflicts)
    9797        $this->field_map[] = array(
    9898            'from_tablename'  => 'forums',

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

    r7006 r7056  
    6262        );
    6363
    64         // Forum slug (Clean name to avoid confilcts)
     64        // Forum slug (Clean name to avoid conflicts)
    6565        $this->field_map[] = array(
    6666            'from_tablename'  => 'forum_forums',

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

    r6670 r7056  
    9696        );
    9797
    98         // Forum slug (Clean name to avoid confilcts)
     98        // Forum slug (Clean name to avoid conflicts)
    9999        $this->field_map[] = array(
    100100            'from_tablename'  => 'Category',

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

    r7006 r7056  
    110110        );
    111111
    112         // Forum slug (Clean name to avoid confilcts)
     112        // Forum slug (Clean name to avoid conflicts)
    113113        // 'node_name' only has slug for explictly named forums
    114114        $this->field_map[] = array(

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

    r6670 r7056  
    9494        );
    9595
    96         // Forum slug (Clean name to avoid confilcts)
     96        // Forum slug (Clean name to avoid conflicts)
    9797        $this->field_map[] = array(
    9898            'from_tablename'   => 'forums',

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

    r6767 r7056  
    9494        );
    9595
    96         // Forum slug (Clean name to avoid confilcts)
     96        // Forum slug (Clean name to avoid conflicts)
    9797        $this->field_map[] = array(
    9898            'from_tablename'  => 'forum',

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

    r7006 r7056  
    9494        );
    9595
    96         // Forum slug (Clean name to avoid confilcts)
     96        // Forum slug (Clean name to avoid conflicts)
    9797        $this->field_map[] = array(
    9898            'from_tablename'  => 'forum',

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

    r7029 r7056  
    22
    33/**
    4  * bbPress User Capabilites
     4 * bbPress User Capabilities
    55 *
    66 * Used to map user capabilities to WordPress's existing capabilities.

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

    r7032 r7056  
    264264    $edit_user = edit_user( $user_id );
    265265
    266     // Error(s) editng the user, so copy them into the global
     266    // Error(s) editing the user, so copy them into the global.
    267267    if ( is_wp_error( $edit_user ) ) {
    268268        bbpress()->errors = $edit_user;

  • trunk/src/templates/default/js/reply.js

    r7010 r7056  
    5757
    5858        /**
    59          * When cancelling a Reply.
     59         * When canceling a Reply.
    6060         *
    6161         * @since 2.6.2
Note: See TracChangeset for help on using the changeset viewer.