WordPress.org

Make WordPress Core

Ticket #17414: PHPDocs-typos-17414.diff

File PHPDocs-typos-17414.diff, 173.1 KB (added by dremeda, 7 years ago)

Typo & format fixes - No standard :/

  • wp-register.php

     
    11<?php
    22/**
    33 * Used to be the page which displayed the registration form.
     4 * This file is deprecated and only exists for backwards compatibility
    45 *
    5  * This file is no longer used in WordPress and is
    6  * deprecated.
    7  *
    86 * @package WordPress
    97 * @deprecated Use wp_register() to create a registration link instead
    108 */
    11 
     9 
    1210require('./wp-load.php');
    1311wp_redirect( site_url('wp-login.php?action=register') );
    1412exit;
  • wp-trackback.php

     
    3333        }
    3434}
    3535
    36 // trackback is done by a POST
     36// Trackback is done by a POST
    3737$request_array = 'HTTP_POST_VARS';
    3838
    3939if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) {
  • wp-settings.php

     
    11<?php
    22/**
    3  * Used to set up and fix common variables and include
     3 * Used to set up and fix common variables and includes
    44 * the WordPress procedural and class library.
    55 *
    66 * Allows for some configuration in wp-config.php (see default-constants.php)
     
    178178require( ABSPATH . WPINC . '/vars.php' );
    179179
    180180// Make taxonomies and posts available to plugins and themes.
    181 // @plugin authors: warning: these get registered again on the init hook.
     181// @plugin authors warning: these get registered again on the init hook.
    182182create_initial_taxonomies();
    183183create_initial_post_types();
    184184
  • wp-admin/network.php

     
    11<?php
    22/**
    3  * Network installation administration panel.
     3 * Network Installation Administration Panel.
    44 *
    55 * A multi-step process allowing the user to enable a network of WordPress sites.
    66 *
     
    126126/**
    127127 * Prints step 1 for Network installation process.
    128128 *
    129  * @todo Realistically, step 1 should be a welcome screen explaining what a Network is and such. Navigating to Tools > Network
     129 * TODO: Realistically, step 1 should be a welcome screen explaining what a Network is and such. Navigating to Tools > Network
    130130 *      should not be a sudden "Welcome to a new install process! Fill this out and click here." See also contextual help todo.
    131131 *
    132132 * @since 3.0.0
     
    192192
    193193        if ( isset( $_POST['subdomain_install'] ) ) {
    194194                $subdomain_install = (bool) $_POST['subdomain_install'];
    195         } elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
     195        } elseif ( apache_mod_loaded('mod_rewrite') ) { // Assume nothing
    196196                $subdomain_install = true;
    197197        } elseif ( !allow_subdirectory_install() ) {
    198198                $subdomain_install = true;
    199199        } else {
    200200                $subdomain_install = false;
    201                 if ( $got_mod_rewrite = got_mod_rewrite() ) // dangerous assumptions
     201                if ( $got_mod_rewrite = got_mod_rewrite() ) // Dangerous assumptions
    202202                        echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.' ) . '</p>';
    203203                elseif ( $is_apache )
    204204                        echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
     
    210210                <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
    211211                <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
    212212                <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
    213                 <?php // @todo: Link to an MS readme? ?>
     213                <?php // TODO: Link to an MS readme? ?>
    214214                <table class="form-table">
    215215                        <tr>
    216216                                <th><label><input type='radio' name='subdomain_install' value='1'<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
     
    493493RewriteCond %{REQUEST_FILENAME} -d
    494494RewriteRule ^ - [L]';
    495495
    496                 // @todo custom content dir.
     496                // TODO: custom content dir.
    497497                if ( ! $subdomain_install )
    498498                        $htaccess_file .= "\nRewriteRule  ^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*) $1 [L]\nRewriteRule  ^[_0-9a-zA-Z-]+/(.*\.php)$ $1 [L]";
    499499
     
    520520        check_admin_referer( 'install-network-1' );
    521521
    522522        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
    523         // create network tables
     523        // Create network tables
    524524        install_network();
    525525        $hostname = get_clean_basedomain();
    526526        $subdomain_install = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
  • wp-admin/users.php

     
    11<?php
    22/**
    3  * Users administration panel.
     3 * Users Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    1919
    2020add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
    2121
    22 // contextual help - choose Help on the top right of admin panel to preview this.
     22// Contextual help - choose Help on the top right of admin panel to preview this.
    2323add_contextual_help($current_screen,
    2424    '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
    2525    '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' .
     
    7373                        continue;
    7474                }
    7575
    76                 // If the user doesn't already belong to the blog, bail.
     76                // If the user doesn't already belong to the Blog, bail.
    7777                if ( is_multisite() && !is_user_member_of_blog( $id ) )
    7878                        wp_die(__('Cheatin&#8217; uh?'));
    7979
  • wp-admin/admin-ajax.php

     
    584584                $tags[ $key ]->id = $tag->term_id;
    585585        }
    586586
    587         // We need raw tag names here, so don't filter the output
     587        // We need raw tag name here, so don't filter the output
    588588        $return = wp_generate_tag_cloud( $tags, array('filter' => 0) );
    589589
    590590        if ( empty($return) )
  • wp-admin/includes/class-ftp.php

     
    11<?php
    22/**
    3  * PemFTP - A Ftp implementation in pure PHP
     3 * PemFTP - An FTP implementation in pure PHP
    44 *
    55 * @package PemFTP
    66 * @since 2.5
  • wp-admin/includes/class-wp-posts-list-table.php

     
    267267
    268268                $posts_columns['cb'] = '<input type="checkbox" />';
    269269
    270                 /* translators: manage posts column name */
     270                /* Translators: manage posts column name */
    271271                $posts_columns['title'] = _x( 'Title', 'column name' );
    272272
    273273                if ( post_type_supports( $post_type, 'author' ) )
     
    347347                }
    348348
    349349                /*
    350                  * arrange pages into two parts: top level pages and children_pages
     350                 * Arrange pages into two parts: top level pages and children_pages.
    351351                 * children_pages is two dimensional array, eg.
    352352                 * children_pages[10][] contains all sub-pages whose parent is 10.
    353                  * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
    354                  * If searching, ignore hierarchy and treat everything as top level
     353                 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations.
     354                 * If searching, ignore hierarchy and treat everything as top level.
    355355                 */
    356356                if ( empty( $_REQUEST['s'] ) ) {
    357357
     
    360360
    361361                        foreach ( $pages as $page ) {
    362362
    363                                 // catch and repair bad pages
     363                                // Catch and repair bad pages
    364364                                if ( $page->post_parent == $page->ID ) {
    365365                                        $page->post_parent = 0;
    366366                                        $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
     
    393393                                $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
    394394                }
    395395
    396                 // if it is the last pagenum and there are orphaned pages, display them with paging as well
     396                // If it is the last pagenum and there are orphaned pages, display them with paging as well
    397397                if ( isset( $children_pages ) && $count < $end ){
    398398                        foreach ( $children_pages as $orphans ){
    399399                                foreach ( $orphans as $op ) {
     
    459459                        $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
    460460                }
    461461
    462                 unset( $children_pages[$parent] ); //required in order to keep track of orphans
     462                unset( $children_pages[$parent] ); //Required in order to keep track of orphans
    463463        }
    464464
    465465        function single_row( $a_post, $level = 0 ) {
     
    506506                                        $attributes = 'class="post-title page-title column-title"' . $style;
    507507
    508508                                        if ( 0 == $level && (int) $post->post_parent > 0 ) {
    509                                                 //sent level 0 by accident, by default, or because we don't know the actual level
     509                                                //Sent level 0 by accident, by default, or because we don't know the actual level
    510510                                                $find_main_page = (int) $post->post_parent;
    511511                                                while ( $find_main_page > 0 ) {
    512512                                                        $parent = get_page( $find_main_page );
     
    782782                                        $authors_dropdown .= $authors;
    783783                                        $authors_dropdown .= '</label>';
    784784                                endif;
    785                         endif; // authors
     785                        endif; // Authors
    786786        ?>
    787787
    788788        <?php if ( !$bulk ) echo $authors_dropdown;
  • wp-admin/includes/plugin-install.php

     
    9797        if ( is_wp_error($api_tags) ) {
    9898                echo $api_tags->get_error_message();
    9999        } else {
    100                 //Set up the tags in a way which can be interprated by wp_generate_tag_cloud()
     100                // Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
    101101                $tags = array();
    102102                foreach ( (array)$api_tags as $tag )
    103103                        $tags[ $tag['name'] ] = (object) array(
     
    175175 * @since 3.0.0
    176176 */
    177177function install_plugin_install_status($api, $loop = false) {
    178         // this function is called recursivly, $loop prevents futhur loops.
     178        // This function is called recursively, $loop prevents futhur loops.
    179179        if ( is_array($api) )
    180180                $api = (object) $api;
    181181
    182         //Default to a "new" plugin
     182        // Default to a "new" plugin
    183183        $status = 'install';
    184184        $url = false;
    185185
    186         //Check to see if this plugin is known to be installed, and has an update awaiting it.
     186        // Check to see if this plugin is known to be installed, and has an update awaiting it.
    187187        $update_plugins = get_site_transient('update_plugins');
    188188        if ( is_object( $update_plugins ) ) {
    189189                foreach ( (array)$update_plugins->response as $file => $plugin ) {
     
    205205                                if ( current_user_can('install_plugins') )
    206206                                        $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
    207207                        } else {
    208                                 $key = array_shift( $key = array_keys($installed_plugin) ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
     208                                $key = array_shift( $key = array_keys($installed_plugin) ); // Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
    209209                                if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
    210210                                        $status = 'latest_installed';
    211211                                } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
    212212                                        $status = 'newer_installed';
    213213                                        $version = $installed_plugin[ $key ]['Version'];
    214214                                } else {
    215                                         //If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
     215                                        // If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
    216216                                        if ( ! $loop ) {
    217217                                                delete_site_transient('update_plugins');
    218218                                                wp_update_plugins();
     
    251251                                                                'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
    252252                                                                'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
    253253                                                                'img' => array('src' => array(), 'class' => array(), 'alt' => array()));
    254         //Sanitize HTML
     254        // Sanitize HTML
    255255        foreach ( (array)$api->sections as $section_name => $content )
    256256                $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
    257257        foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key )
     
    302302                ?>
    303303                </p>
    304304                <?php endif; ?>
    305                 <h2 class="mainheader"><?php /* translators: For Your Information */ _e('FYI') ?></h2>
     305                <h2 class="mainheader"><?php /* Translators: For Your Information */ _e('FYI') ?></h2>
    306306                <ul>
    307307<?php if ( ! empty($api->version) ) : ?>
    308308                        <li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>
  • wp-admin/includes/class-pclzip.php

     
    3535  // (which is not a very smart choice, specifically for windows paths !).
    3636  // A better separator should be a comma (,). This constant gives you the
    3737  // abilty to change that.
    38   // However notice that changing this value, may have impact on existing
     38  // However, notice that changing this value, may have impact on existing
    3939  // scripts, using space separated filenames.
    40   // Recommanded values for compatibility with older versions :
     40  // Recommended values for compatibility with older versions :
    4141  //define( 'PCLZIP_SEPARATOR', ' ' );
    42   // Recommanded values for smart separation of filenames.
     42  // Recommended values for smart separation of filenames.
    4343  if (!defined('PCLZIP_SEPARATOR')) {
    4444    define( 'PCLZIP_SEPARATOR', ',' );
    4545  }
    4646
    4747  // ----- Error configuration
    48   // 0 : PclZip Class integrated error handling
     48  // 0 : PclZip class integrated error handling
    4949  // 1 : PclError external library error handling. By enabling this
    5050  //     you must ensure that you have included PclError library.
    51   // [2,...] : reserved for futur use
     51  // [2,...] : reserved for future use
    5252  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
    5353    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
    5454  }
     
    166166  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
    167167  define( 'PCLZIP_CB_PRE_ADD', 78003 );
    168168  define( 'PCLZIP_CB_POST_ADD', 78004 );
    169   /* For futur use
     169  /* For future use
    170170  define( 'PCLZIP_CB_PRE_LIST', 78005 );
    171171  define( 'PCLZIP_CB_POST_LIST', 78006 );
    172172  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
     
    176176  // --------------------------------------------------------------------------------
    177177  // Class : PclZip
    178178  // Description :
    179   //   PclZip is the class that represent a Zip archive.
     179  //   PclZip is the class that represents a Zip archive.
    180180  //   The public methods allow the manipulation of the archive.
    181181  // Attributes :
    182182  //   Attributes must not be accessed directly.
     
    200200    var $error_string = '';
    201201
    202202    // ----- Current status of the magic_quotes_runtime
    203     // This value store the php configuration for magic_quotes
     203    // This value stores the php configuration for magic_quotes
    204204    // The class can then disable the magic_quotes and reset it after
    205205    var $magic_quotes_status;
    206206
     
    244244  //   When a directory is in the list, the directory and its content is added
    245245  //   in the archive.
    246246  //   In this synopsis, the function takes an optional variable list of
    247   //   options. See bellow the supported options.
     247  //   options. See below the supported options.
    248248  // Parameters :
    249249  //   $p_filelist : An array containing file or directory names, or
    250250  //                 a string containing one filename or one directory name, or
     
    313313        }
    314314      }
    315315
    316       // ----- Look for 2 args
     316      // ----- Look for 2 arguments
    317317      // Here we need to support the first historic synopsis of the
    318318      // method.
    319319      else {
     
    474474      array_shift($v_arg_list);
    475475      $v_size--;
    476476
    477       // ----- Look for first arg
     477      // ----- Look for first argument
    478478      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
    479479
    480480        // ----- Parse the options
     
    498498        }
    499499      }
    500500
    501       // ----- Look for 2 args
     501      // ----- Look for 2 arguments
    502502      // Here we need to support the first historic synopsis of the
    503503      // method.
    504504      else {
     
    775775        }
    776776      }
    777777
    778       // ----- Look for 2 args
     778      // ----- Look for 2 arguments
    779779      // Here we need to support the first historic synopsis of the
    780780      // method.
    781781      else {
     
    888888      array_shift($v_arg_list);
    889889      $v_size--;
    890890
    891       // ----- Look for first arg
     891      // ----- Look for first argument
    892892      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
    893893
    894894        // ----- Parse the options
     
    10601060  // Function : deleteByIndex()
    10611061  // Description :
    10621062  //   ***** Deprecated *****
    1063   //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
     1063  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be preferred.
    10641064  // --------------------------------------------------------------------------------
    10651065  function deleteByIndex($p_index)
    10661066  {
     
    11221122        return 0;
    11231123      }
    11241124
    1125       // ----- Read the central directory informations
     1125      // ----- Read the central directory information
    11261126      $v_central_dir = array();
    11271127      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
    11281128      {
     
    13871387      return(false);
    13881388    }
    13891389
    1390     // ----- Check that the file is readeable
     1390    // ----- Check that the file is readable
    13911391    if (!is_readable($this->zipname)) {
    13921392      // ----- Error log
    13931393      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
     
    19851985  // --------------------------------------------------------------------------------
    19861986  // Function : privFileDescrExpand()
    19871987  // Description :
    1988   //   This method look for each item of the list to see if its a file, a folder
    1989   //   or a string to be added as file. For any other type of files (link, other)
     1988  //   This method looks for each item of the list to see if it's a file, a folder
     1989  //   or a string to be added as a file. For any other type of files (link, other)
    19901990  //   just ignore the item.
    19911991  //   Then prepare the information that will be stored for that file.
    1992   //   When its a folder, expand the folder with all the files that are in that
     1992  //   When it's a folder, expand the folder with all the files that are in that
    19931993  //   folder (recursively).
    19941994  // Parameters :
    19951995  // Return Values :
     
    20672067            // ----- Compose the full filename
    20682068            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
    20692069
    2070             // ----- Look for different stored filename
    2071             // Because the name of the folder was changed, the name of the
     2070            // ----- Look for different stored filenames
     2071            // because the name of the folder was changed, the name of the
    20722072            // files/sub-folders also change
    20732073            if (($v_descr['stored_filename'] != $v_descr['filename'])
    20742074                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
     
    21932193      return $v_result;
    21942194    }
    21952195
    2196     // ----- Go to beginning of File
     2196    // ----- Go to beginning of file
    21972197    @rewind($this->zip_fd);
    21982198
    21992199    // ----- Creates a temporay file
     
    24882488        return PclZip::errorCode();
    24892489      }
    24902490
    2491       // ----- Look if it is a file or a dir with no all path remove option
    2492       // or a dir with all its path removed
     2491      // ----- Look if it is a file or a directory with no all path remove option
     2492      // or a directory with all its pathes removed
    24932493//      if (   (is_file($p_filedescr_list[$j]['filename']))
    24942494//          || (   is_dir($p_filedescr_list[$j]['filename'])
    24952495      if (   ($p_filedescr_list[$j]['type'] == 'file')
     
    25882588    }
    25892589
    25902590
    2591     // ----- Look for filetime
     2591    // ----- Look for file time
    25922592    if (isset($p_filedescr['mtime'])) {
    25932593      $p_header['mtime'] = $p_filedescr['mtime'];
    25942594    }
     
    26122612    // ----- Look for pre-add callback
    26132613    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
    26142614
    2615       // ----- Generate a local information
     2615      // ----- Generate local information
    26162616      $v_local_header = array();
    26172617      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
    26182618
     
    26262626        $v_result = 1;
    26272627      }
    26282628
    2629       // ----- Update the informations
     2629      // ----- Update the information
    26302630      // Only some fields can be modified
    26312631      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
    26322632        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
     
    29012901  // Function : privCalculateStoredFilename()
    29022902  // Description :
    29032903  //   Based on file descriptor properties and global options, this method
    2904   //   calculate the filename that will be stored in the archive.
     2904  //   calculates the filename that will be stored in the archive.
    29052905  // Parameters :
    29062906  // Return Values :
    29072907  // --------------------------------------------------------------------------------
     
    29412941    else {
    29422942
    29432943      // ----- Look for short name change
    2944       // Its when we cahnge just the filename but not the path
     2944      // Its when we change just the filename but not the path
    29452945      if (isset($p_filedescr['new_short_name'])) {
    29462946        $v_path_info = pathinfo($p_filename);
    29472947        $v_dir = '';
     
    31643164      return PclZip::errorCode();
    31653165    }
    31663166
    3167     // ----- Read the central directory informations
     3167    // ----- Read the central directory information
    31683168    $v_central_dir = array();
    31693169    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
    31703170    {
     
    32153215  // --------------------------------------------------------------------------------
    32163216  // Function : privConvertHeader2FileInfo()
    32173217  // Description :
    3218   //   This function takes the file informations from the central directory
    3219   //   entries and extract the interesting parameters that will be given back.
    3220   //   The resulting file infos are set in the array $p_info
     3218  //   This function takes the file information from the central directory
     3219  //   entries and extracts the interesting parameters that will be given back.
     3220  //   The resulting file infomation is set in the array $p_info
    32213221  //     $p_info['filename'] : Filename with full path. Given by user (add),
    32223222  //                           extracted in the filesystem (extract).
    32233223  //     $p_info['stored_filename'] : Stored filename in the archive.
     
    33273327    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
    33283328    {
    33293329
    3330       // ----- Read next Central dir entry
     3330      // ----- Read next Central directory entry
    33313331      @rewind($this->zip_fd);
    33323332      if (@fseek($this->zip_fd, $v_pos_entry))
    33333333      {
     
    36873687    // ----- Look for pre-extract callback
    36883688    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
    36893689
    3690       // ----- Generate a local information
     3690      // ----- Generate local information
    36913691      $v_local_header = array();
    36923692      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
    36933693
     
    37493749        $p_entry['status'] = "write_protected";
    37503750
    37513751        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
    3752         // For historical reason first PclZip implementation does not stop
     3752        // For historical reasons first PclZip implementation does not stop
    37533753        // when this kind of error occurs.
    37543754        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
    37553755                    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
     
    37733773            $p_entry['status'] = "newer_exist";
    37743774
    37753775            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
    3776             // For historical reason first PclZip implementation does not stop
     3776            // For historical reasons first PclZip implementation does not stop
    37773777            // when this kind of error occurs.
    37783778            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
    37793779                        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
     
    38563856        }
    38573857        else {
    38583858          // ----- TBC
    3859           // Need to be finished
     3859          // Needs to be finished
    38603860          if (($p_entry['flag'] & 1) == 1) {
    38613861            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
    38623862            return PclZip::errorCode();
     
    39333933    // ----- Look for post-extract callback
    39343934    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
    39353935
    3936       // ----- Generate a local information
     3936      // ----- Generate local information
    39373937      $v_local_header = array();
    39383938      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
    39393939
     
    40534053    // ----- Look for pre-extract callback
    40544054    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
    40554055
    4056       // ----- Generate a local information
     4056      // ----- Generate local information
    40574057      $v_local_header = array();
    40584058      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
    40594059
     
    40754075        $v_result = PCLZIP_ERR_USER_ABORTED;
    40764076      }
    40774077
    4078       // ----- Update the informations
     4078      // ----- Update the information
    40794079      // Only some fields can be modified
    40804080      $p_entry['filename'] = $v_local_header['filename'];
    40814081    }
     
    41214121    // ----- Look for post-extract callback
    41224122    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
    41234123
    4124       // ----- Generate a local information
     4124      // ----- Generate local information
    41254125      $v_local_header = array();
    41264126      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
    41274127
     
    41674167    // ----- Look for pre-extract callback
    41684168    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
    41694169
    4170       // ----- Generate a local information
     4170      // ----- Generate local information
    41714171      $v_local_header = array();
    41724172      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
    41734173
     
    41884188        $v_result = PCLZIP_ERR_USER_ABORTED;
    41894189      }
    41904190
    4191       // ----- Update the informations
     4191      // ----- Update the information
    41924192      // Only some fields can be modified
    41934193      $p_entry['filename'] = $v_local_header['filename'];
    41944194    }
     
    42334233    // ----- Look for post-extract callback
    42344234    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
    42354235
    4236       // ----- Generate a local information
     4236      // ----- Generate local information
    42374237      $v_local_header = array();
    42384238      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
    42394239
     
    43744374  {
    43754375    $v_result=1;
    43764376
    4377     // ----- Read the 4 bytes signature
     4377    // ----- Read the 4 byte signature
    43784378    $v_binary_data = @fread($this->zip_fd, 4);
    43794379    $v_data = unpack('Vid', $v_binary_data);
    43804380
     
    45824582
    45834583        // -----  Add the byte
    45844584        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
    4585         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
     4585        // NOTE: We mask the old value down such that once shifted, we never end up with more than a 32bit number.
    45864586        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
    45874587        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
    45884588
     
    46844684      return $v_result;
    46854685    }
    46864686
    4687     // ----- Read the central directory informations
     4687    // ----- Read the central directory information
    46884688    $v_central_dir = array();
    46894689    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
    46904690    {
     
    50705070      return $v_result;
    50715071    }
    50725072
    5073     // ----- Read the central directory informations
     5073    // ----- Read the central directory information
    50745074    $v_central_dir = array();
    50755075    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
    50765076    {
     
    50905090      return $v_result;
    50915091    }
    50925092
    5093     // ----- Read the central directory informations
     5093    // ----- Read the central directory information
    50945094    $v_central_dir_to_add = array();
    50955095    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
    50965096    {
  • wp-admin/includes/class-wp-media-list-table.php

     
    130130                $posts_columns = array();
    131131                $posts_columns['cb'] = '<input type="checkbox" />';
    132132                $posts_columns['icon'] = '';
    133                 /* translators: column name */
     133                /* Translators: column name */
    134134                $posts_columns['title'] = _x( 'File', 'column name' );
    135135                $posts_columns['author'] = __( 'Author' );
    136136                //$posts_columns['tags'] = _x( 'Tags', 'column name' );
     
    139139                        $posts_columns['parent'] = _x( 'Attached to', 'column name' );
    140140                        $posts_columns['comments'] = '<div class="vers"><img alt="Comments" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
    141141                }
    142                 /* translators: column name */
     142                /* Translators: column name */
    143143                $posts_columns['date'] = _x( 'Date', 'column name' );
    144144                $posts_columns = apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
    145145
  • wp-admin/includes/menu.php

     
    4343
    4444$_wp_submenu_nopriv = array();
    4545$_wp_menu_nopriv = array();
    46 // Loop over submenus and remove pages for which the user does not have privs.
     46// Loop over submenus and remove pages for which the user does not have privileges.
    4747foreach ( array( 'submenu' ) as $sub_loop ) {
    4848        foreach ($$sub_loop as $parent => $sub) {
    4949                foreach ($sub as $index => $data) {
     
    6262unset($sub_loop);
    6363
    6464// Loop over the top-level menu.
    65 // Menus for which the original parent is not accessible due to lack of privs will have the next
     65// Menus for which the original parent is not accessible due to lack of privilegess will have the next
    6666// submenu in line be assigned as the new menu parent.
    6767foreach ( $menu as $id => $data ) {
    6868        if ( empty($submenu[$data[2]]) )
     
    9696else
    9797        do_action('admin_menu', '');
    9898
    99 // Remove menus that have no accessible submenus and require privs that the user does not have.
     99// Remove menus that have no accessible submenus and require privilegess that the user does not have.
    100100// Run re-parent loop again.
    101101foreach ( $menu as $id => $data ) {
    102102        if ( ! current_user_can($data[1]) )
     
    104104
    105105        // If submenu is empty...
    106106        if ( empty($submenu[$data[2]]) ) {
    107                 // And user doesn't have privs, remove menu.
     107                // And user doesn't have privileges, remove menu.
    108108                if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
    109109                        unset($menu[$id]);
    110110                }
     
    141141        foreach ( $menu as $order => $top ) {
    142142                $i++;
    143143
    144                 if ( 0 == $order ) { // dashboard is always shown/single
     144                if ( 0 == $order ) { // Dashboard is always shown/single
    145145                        $menu[0][4] = add_cssclass('menu-top-first', $top[4]);
    146146                        $lastorder = 0;
    147147                        continue;
    148148                }
    149149
    150                 if ( 0 === strpos($top[2], 'separator') ) { // if separator
     150                if ( 0 === strpos($top[2], 'separator') ) { // If separator
    151151                        $first = true;
    152152                        $c = $menu[$lastorder][4];
    153153                        $menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
     
    171171        return apply_filters( 'add_menu_classes', $menu );
    172172}
    173173
    174 uksort($menu, "strnatcasecmp"); // make it all pretty
     174uksort($menu, "strnatcasecmp"); // Make it all pretty
    175175
    176176if ( apply_filters('custom_menu_order', false) ) {
    177177        $menu_order = array();
  • wp-admin/includes/class-ftp-pure.php

     
    11<?php
    22/**
    3  * PemFTP - A Ftp implementation in pure PHP
     3 * PemFTP - An FTP implementation in pure PHP
    44 *
    55 * @package PemFTP
    66 * @since 2.5
  • wp-admin/includes/class-ftp-sockets.php

     
    11<?php
    22/**
    3  * PemFTP - A Ftp implementation in pure PHP
     3 * PemFTP - An FTP implementation in pure PHP
    44 *
    55 * @package PemFTP
    66 * @since 2.5
  • wp-admin/includes/internal-linking.php

     
    11<?php
    22/**
    3  * Internal linking functions.
     3 * Internal Linking Functions.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    6464}
    6565
    6666/**
    67  * Dialog for internal linking.
     67 * Dialog For Internal Linking.
    6868 *
    6969 * @since 3.1.0
    7070 */
  • wp-admin/includes/manifest.php

     
    99$mce_ver = "ver=$tinymce_version";
    1010
    1111/**
    12  * Retrieve list of all cacheable WP files
     12 * Retrieve list of all cacheable WordPress files
    1313 *
    1414 * Array format: file, version (optional), bool (whether to use src and set ignoreQuery, defaults to true)
    1515 */
  • wp-admin/includes/file.php

     
    465465}
    466466
    467467/**
    468  * Downloads a url to a local temporary file using the WordPress HTTP Class.
    469  * Please note, That the calling function must unlink() the  file.
     468 * Downloads a URL to a local temporary file using the WordPress HTTP Class.
     469 * Please note, That the calling function must unlink() the file.
    470470 *
    471471 * @since 2.5.0
    472472 *
    473473 * @param string $url the URL of the file to download
    474474 * @param int $timeout The timeout for the request to download the file default 300 seconds
    475  * @return mixed WP_Error on failure, string Filename on success.
     475 * @return mixed WP_Error on failure, string filename on success.
    476476 */
    477477function download_url( $url, $timeout = 300 ) {
    478478        //WARNING: The file is not automatically deleted, The script must unlink() the file.
     
    499499}
    500500
    501501/**
    502  * Unzip's a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
     502 * Unzip's a specified ZIP file to a location on the filesystem via the WordPress Filesystem Abstraction.
    503503 * Assumes that WP_Filesystem() has already been called and set up. Does not extract a root-level __MACOSX directory, if present.
    504504 *
    505505 * Attempts to increase the PHP Memory limit to 256M before uncompressing,
     
    509509 *
    510510 * @param string $file Full path and filename of zip archive
    511511 * @param string $to Full path on the filesystem to extract archive to
    512  * @return mixed WP_Error on failure, True on success
     512 * @return mixed WP_Error on failure, true on success
    513513 */
    514514function unzip_file($file, $to) {
    515515        global $wp_filesystem;
     
    523523        $needed_dirs = array();
    524524        $to = trailingslashit($to);
    525525
    526         // Determine any parent dir's needed (of the upgrade directory)
    527         if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
     526        // Determine any parent directories needed (of the upgrade directory)
     527        if ( ! $wp_filesystem->is_dir($to) ) { // Only do parents if no children exist
    528528                $path = preg_split('![/\\\]!', untrailingslashit($to));
    529529                for ( $i = count($path); $i >= 0; $i-- ) {
    530530                        if ( empty($path[$i]) )
    531531                                continue;
    532532
    533533                        $dir = implode('/', array_slice($path, 0, $i+1) );
    534                         if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
     534                        if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows drive letter.
    535535                                continue;
    536536
    537537                        if ( ! $wp_filesystem->is_dir($dir) )
    538538                                $needed_dirs[] = $dir;
    539539                        else
    540                                 break; // A folder exists, therefor, we dont need the check the levels below this
     540                                break; // A folder exists, therefore, we dont need the check the levels below this
    541541                }
    542542        }
    543543
     
    572572
    573573        $z = new ZipArchive();
    574574
    575         // PHP4-compat - php4 classes can't contain constants
     575        // PHP4-compat - PHP4 classes can't contain constants
    576576        $zopen = $z->open($file, /* ZIPARCHIVE::CHECKCONS */ 4);
    577577        if ( true !== $zopen )
    578578                return new WP_Error('incompatible_archive', __('Incompatible Archive.'));
     
    584584                if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
    585585                        continue;
    586586
    587                 if ( '/' == substr($info['name'], -1) ) // directory
     587                if ( '/' == substr($info['name'], -1) ) // Directory
    588588                        $needed_dirs[] = $to . untrailingslashit($info['name']);
    589589                else
    590590                        $needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
     
    593593        $needed_dirs = array_unique($needed_dirs);
    594594        foreach ( $needed_dirs as $dir ) {
    595595                // Check the parent folders of the folders all exist within the creation array.
    596                 if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
     596                if ( untrailingslashit($to) == $dir ) // Skip over the working directory, we know this exists (or will exist)
    597597                        continue;
    598                 if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
     598                if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, skip it
    599599                        continue;
    600600
    601601                $parent_folder = dirname($dir);
     
    608608
    609609        // Create those directories if need be:
    610610        foreach ( $needed_dirs as $_dir ) {
    611                 if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the Dir exists upon creation failure. Less I/O this way.
     611                if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the directory exists upon creation failure. Less I/O this way.
    612612                        return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
    613613        }
    614614        unset($needed_dirs);
     
    617617                if ( ! $info = $z->statIndex($i) )
    618618                        return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));
    619619
    620                 if ( '/' == substr($info['name'], -1) ) // directory
     620                if ( '/' == substr($info['name'], -1) ) // Directory
    621621                        continue;
    622622
    623623                if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
     
    685685        $needed_dirs = array_unique($needed_dirs);
    686686        foreach ( $needed_dirs as $dir ) {
    687687                // Check the parent folders of the folders all exist within the creation array.
    688                 if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
     688                if ( untrailingslashit($to) == $dir ) // Skip over the working directory, we know this exists (or will exist)
    689689                        continue;
    690                 if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
     690                if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, skip it
    691691                        continue;
    692692
    693693                $parent_folder = dirname($dir);
     
    700700
    701701        // Create those directories if need be:
    702702        foreach ( $needed_dirs as $_dir ) {
    703                 if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the dir exists upon creation failure. Less I/O this way.
     703                if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir) ) // Only check to see if the directory exists upon creation failure. Less I/O this way.
    704704                        return new WP_Error('mkdir_failed', __('Could not create directory.'), $_dir);
    705705        }
    706706        unset($needed_dirs);
    707707
    708         // Extract the files from the zip
     708        // Extract the files from the ZIP
    709709        foreach ( $archive_files as $file ) {
    710710                if ( $file['folder'] )
    711711                        continue;
     
    728728 * @param string $from source directory
    729729 * @param string $to destination directory
    730730 * @param array $skip_list a list of files/folders to skip copying
    731  * @return mixed WP_Error on failure, True on success.
     731 * @return mixed WP_Error on failure, true on success.
    732732 */
    733733function copy_dir($from, $to, $skip_list = array() ) {
    734734        global $wp_filesystem;
     
    771771}
    772772
    773773/**
    774  * Initialises and connects the WordPress Filesystem Abstraction classes.
     774 * Initializes and connects the WordPress Filesystem Abstraction classes.
    775775 * This function will include the chosen transport and attempt connecting.
    776776 *
    777777 * Plugins may add extra transports, And force WordPress to use them by returning the filename via the 'filesystem_method_file' filter.
     
    813813                return false;
    814814
    815815        if ( !$wp_filesystem->connect() )
    816                 return false; //There was an erorr connecting to the server.
     816                return false; //There was an error connecting to the server.
    817817
    818818        // Set the permission constants if not already set.
    819819        if ( ! defined('FS_CHMOD_DIR') )
     
    865865
    866866/**
    867867 * Displays a form to the user to request for their FTP/SSH details in order to  connect to the filesystem.
    868  * All chosen/entered details are saved, Excluding the Password.
     868 * All chosen/entered details are saved, Excluding the password.
    869869 *
    870870 * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port.
    871871 *
     
    874874 * @since 2.5.0
    875875 *
    876876 * @param string $form_post the URL to post the form to
    877  * @param string $type the chosen Filesystem method in use
     877 * @param string $type the chosen filesystem method in use
    878878 * @param boolean $error if the current request has failed to connect
    879879 * @param string $context The directory which is needed access to, The write-test will be performed on  this directory by get_filesystem_method()
    880880 * @param string $extra_fields Extra POST fields which should be checked for to be included in the post.
     
    896896
    897897        $credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
    898898
    899         // If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
     899        // If defined, set it to that, else, if POST'd, set it to that, if not, set it to whatever it previously was(saved details in option)
    900900        $credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? stripslashes($_POST['hostname']) : $credentials['hostname']);
    901901        $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? stripslashes($_POST['username']) : $credentials['username']);
    902902        $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? stripslashes($_POST['password']) : '');
     
    905905        $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? stripslashes($_POST['public_key']) : '');
    906906        $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? stripslashes($_POST['private_key']) : '');
    907907
    908         //sanitize the hostname, Some people might pass in odd-data:
     908        //sanitize the hostname, some people might pass in odd-data:
    909909        $credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
    910910
    911911        if ( strpos($credentials['hostname'], ':') ) {
     
    922922                $credentials['connection_type'] = 'ftps';
    923923        else if ( !empty($_POST['connection_type']) )
    924924                $credentials['connection_type'] = stripslashes($_POST['connection_type']);
    925         else if ( !isset($credentials['connection_type']) ) //All else fails (And its not defaulted to something else saved), Default to FTP
     925        else if ( !isset($credentials['connection_type']) ) //All else fails (And its not defaulted to something else saved), default to FTP
    926926                $credentials['connection_type'] = 'ftp';
    927927
    928928        if ( ! $error &&
     
    931931                                ( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
    932932                        ) ) {
    933933                $stored_credentials = $credentials;
    934                 if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
     934                if ( !empty($stored_credentials['port']) ) //Save port as part of hostname to simplify above code.
    935935                        $stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
    936936
    937937                unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
  • wp-admin/includes/class-wp-terms-list-table.php

     
    7474        }
    7575
    7676        function has_items() {
    77                 // todo: populate $this->items in prepare_items()
     77                // TODO: populate $this->items in prepare_items()
    7878                return true;
    7979        }
    8080
     
    137137
    138138                $args['offset'] = $offset = ( $page - 1 ) * $number;
    139139
    140                 // convert it to table rows
     140                // Convert it to table rows
    141141                $out = '';
    142142                $count = 0;
    143143
     
    153153                        else
    154154                                $children = _get_term_hierarchy( $taxonomy );
    155155
    156                         // Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
     156                        // Some funky recursion to get the job done( Paging & parents mainly ) is contained within, skip it for non-hierarchical taxonomies for performance sake
    157157                        $out .= $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
    158158                } else {
    159159                        $terms = get_terms( $taxonomy, $args );
  • wp-admin/includes/class-wp-filesystem-base.php

     
    3030        var $cache = array();
    3131
    3232        /**
    33          * The Access method of the current connection, Set automatically.
     33         * The Access method of the current connection, set automatically.
    3434         *
    3535         * @since 2.5
    3636         * @access public
     
    4747         */
    4848        function abspath() {
    4949                $folder = $this->find_folder(ABSPATH);
    50                 //Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
     50                //Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, could have some false positives, but rare.
    5151                if ( ! $folder && $this->is_dir('/wp-includes') )
    5252                        $folder = '/';
    5353                return $folder;
     
    202202                                continue; //We want this to be caught by the next code block.
    203203
    204204                        //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
    205                         // If its found, change into it and follow through looking for it.
    206                         // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
     205                        // if it's found, change into it and follow through looking for it.
     206                        // If it can't find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
    207207                        // If it reaches the end, and still cant find it, it'll return false for the entire function.
    208208                        if ( isset($files[ $key ]) ){
    209209                                //Lets try that folder:
     
    223223                }
    224224                if ( $loop )
    225225                        return false; //Prevent this function from looping again.
    226                 //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
     226                //As an extra last resort, change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WordPress is at /var/www/.... mainly dedicated setups.
    227227                return $this->search_for_folder($folder, '/', true);
    228228
    229229        }
     
    283283        }
    284284
    285285        /**
    286          * Converts *nix style file permissions to a octal number.
     286         * Converts *nix style file permissions to an octal number.
    287287         *
    288288         * Converts '-rw-r--r--' to 0644
    289289         * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
  • wp-admin/includes/post.php

     
    787787//
    788788
    789789/**
    790  * Replace hrefs of attachment anchors with up-to-date permalinks.
     790 * Replace HREF's of attachment anchors with up-to-date permalinks.
    791791 *
    792792 * @since 2.3.0
    793793 * @access private
     
    947947}
    948948
    949949/**
    950  * Get default post mime types
     950 * Get default post MIME types
    951951 *
    952952 * @since 2.9.0
    953953 *
     
    10521052 *
    10531053 * @since 2.5.0
    10541054 *
    1055  * @param int|object $id    Post ID or post object.
     1055 * @param int|object $id Post ID or post object.
    10561056 * @param string $title (optional) Title
    10571057 * @param string $name (optional) Name
    10581058 * @return array With two entries of type string
     
    11101110}
    11111111
    11121112/**
    1113  * sample permalink html
     1113 * Sample Permalink HTML
    11141114 *
    1115  * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
     1115 * Intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
    11161116 *
    11171117 * @since 2.5.0
    11181118 *
     
    14181418                /*
    14191419                The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
    14201420                It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin.
    1421                 The url should be absolute and should include the js file name to be loaded. Example:
     1421                The url should be absolute and should include the JavaScript file name to be loaded. Example:
    14221422                array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' )
    14231423                If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
    14241424                */
     
    17381738        global $content_width, $post;
    17391739
    17401740        $width = isset($content_width) && 800 > $content_width ? $content_width : 800;
    1741         $width = $width + 10; // compensate for the padding
     1741        $width = $width + 10; // Compensate for the padding
    17421742        $dfw_width = get_user_setting( 'dfw_width', $width );
    17431743        $save = $post->post_status == 'publish' ? __('Update') : __('Save');
    17441744?>
     
    17571757<?php
    17581758
    17591759        $buttons = array(
    1760                 // format: title, onclick, show in both editors
     1760                // Format: title, onclick, show in both editors
    17611761                'bold' => array( 'title' => __('Bold (Ctrl + B)'), 'onclick' => 'fullscreen.b();', 'both' => false ),
    17621762                'italic' => array( 'title' => __('Italic (Ctrl + I)'), 'onclick' => 'fullscreen.i();', 'both' => false ),
    17631763                '0' => 'separator',
  • wp-admin/includes/class-wp-users-list-table.php

     
    110110                        }
    111111
    112112                        $name = translate_user_role( $name );
    113                         /* translators: User role name with count */
     113                        /* Translators: User role name with count */
    114114                        $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, $avail_roles[$this_role] );
    115115                        $role_links[$this_role] = "<a href='" . add_query_arg( 'role', $this_role, $url ) . "'$class>$name</a>";
    116116                }
  • wp-admin/includes/upgrade.php

     
    127127
    128128        // Default link category
    129129        $cat_name = __('Blogroll');
    130         /* translators: Default link category slug */
     130        /* Translators: Default link category slug */
    131131        $cat_slug = sanitize_title(_x('Blogroll', 'Default link category slug'));
    132132
    133133        if ( global_terms_enabled() ) {
     
    262262                                                                'post_content' => $first_page,
    263263                                                                'post_excerpt' => '',
    264264                                                                'post_title' => __( 'Sample Page' ),
    265                                                                 /* translators: Default page slug */
     265                                                                /* Translators: Default page slug */
    266266                                                                'post_name' => __( 'sample-page' ),
    267267                                                                'post_modified' => $now,
    268268                                                                'post_modified_gmt' => $now_gmt,
     
    728728                $wpdb->query("ALTER TABLE $wpdb->users DROP $old");
    729729        $wpdb->show_errors();
    730730
    731         // populate comment_count field of posts table
     731        // Populate comment_count field of posts table
    732732        $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
    733733        if ( is_array( $comments ) )
    734734                foreach ($comments as $comment)
     
    12681268                        return true;
    12691269                }
    12701270        }
    1271         //didn't find it try to create it.
     1271        // Didn't find it try to create it.
    12721272        $q = $wpdb->query($create_ddl);
    1273         // we cannot directly tell that whether this succeeded!
     1273        // We cannot directly tell that whether this succeeded!
    12741274        foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
    12751275                if ($column == $column_name) {
    12761276                        return true;
     
    15371537                                                $index_string .= ' ('.$index_columns.')';
    15381538                                                if (!(($aindex = array_search($index_string, $indices)) === false)) {
    15391539                                                        unset($indices[$aindex]);
    1540                                                         //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
     1540                                                        // echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
    15411541                                                }
    1542                                                 //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
     1542                                                // else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
    15431543                                        }
    15441544                                }
    15451545
     
    16191619
    16201620        // Copy files from the old locations to the site theme.
    16211621        // TODO: This does not copy arbitarary include dependencies.  Only the
    1622         // standard WP files are copied.
     1622        // standard WordPress files are copied.
    16231623        $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
    16241624
    16251625        foreach ($files as $oldfile => $newfile) {
     
    19691969  KEY domain (domain)
    19701970) $charset_collate;
    19711971";
    1972 // now create tables
     1972// Now create tables
    19731973        dbDelta( $ms_queries );
    19741974}
    19751975endif;
     
    19941994  KEY last_updated (last_updated)
    19951995) $charset_collate;
    19961996";
    1997 // now create tables
     1997// Now create tables
    19981998        dbDelta( $ms_queries );
    19991999}
    20002000endif;
  • wp-admin/includes/class-wp-list-table.php

     
    139139                if ( !$args['total_pages'] && $args['per_page'] > 0 )
    140140                        $args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
    141141
    142                 // redirect if page number is invalid and headers are not already sent
     142                // Redirect if page number is invalid and headers are not already sent
    143143                if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
    144144                        wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
    145145                        exit;
     
    302302         * @since 3.1.0
    303303         * @access public
    304304         *
    305          * @return string|bool The action name or False if no action was selected
     305         * @return string|bool the action name or False if no action was selected
    306306         */
    307307        function current_action() {
    308308                if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
     
    854854        }
    855855
    856856        /**
    857          * Handle an incoming ajax request (called from admin-ajax.php)
     857         * Handle an incoming AJAX request (called from admin-ajax.php)
    858858         *
    859859         * @since 3.1.0
    860860         * @access public
  • wp-admin/includes/class-wp-ms-themes-list-table.php

     
    3838        }
    3939
    4040        function get_table_classes() {
    41                 return array( 'widefat', 'plugins' );   // todo: remove and add CSS for .themes
     41                return array( 'widefat', 'plugins' );   // TODO: remove and add CSS for .themes
    4242        }
    4343
    4444        function ajax_user_can() {
     
    269269                else
    270270                        $url = 'themes.php?';
    271271
    272                 // preorder
     272                // Preorder
    273273                $actions = array(
    274274                        'enable' => '',
    275275                        'disable' => '',
  • wp-admin/includes/class-wp-plugin-install-list-table.php

     
    4040                $tabs = apply_filters( 'install_plugins_tabs', $tabs );
    4141                $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
    4242
    43                 // If a non-valid menu tab has been selected, And its not a non-menu action.
     43                // If a non-valid menu tab has been selected, And it's not a non-menu action.
    4444                if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
    4545                        $tab = key( $tabs );
    4646
  • wp-admin/includes/dashboard.php

     
    131131        }
    132132
    133133        if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
    134                 ob_start(); // hack - but the same hack wp-admin/widgets.php uses
     134                ob_start(); // Hack - but the same hack wp-admin/widgets.php uses
    135135                wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
    136136                ob_end_clean();
    137137                wp_redirect( remove_query_arg( 'edit' ) );
     
    268268
    269269        echo '</tr><tr>';
    270270        /* TODO: Show status breakdown on hover
    271         if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
     271        if ( $can_edit_pages && !empty($num_pages->publish) ) { // How many pages are not exposed in feeds.  Don't show if !current_user_can
    272272                $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
    273273        }
    274274        if ( $can_edit_posts && !empty($num_posts->draft) ) {
     
    505505        $last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
    506506        if ( $last_post_id ) {
    507507                $post = get_post( $last_post_id );
    508                 if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
     508                if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // Auto-draft doesn't exist anymore
    509509                        $post = get_default_post_to_edit('post', true);
    510510                        update_user_option( (int) $GLOBALS['current_user']->ID, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
    511511                } else {
     
    669669
    670670        $actions_string = '';
    671671        if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
    672                 // preorder it: Approve | Reply | Edit | Spam | Trash
     672                // Preorder it: Approve | Reply | Edit | Spam | Trash
    673673                $actions = array(
    674674                        'approve' => '', 'unapprove' => '',
    675675                        'reply' => '',
     
    691691                $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
    692692                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
    693693                $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
    694                 $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */  _x( 'Spam', 'verb' ) . '</a>';
     694                $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* Translators: mark as spam link */  _x( 'Spam', 'verb' ) . '</a>';
    695695                if ( !EMPTY_TRASH_DAYS )
    696696                        $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
    697697                else
     
    721721
    722722                        <div class="dashboard-comment-wrap">
    723723                        <h4 class="comment-meta">
    724                                 <?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
     724                                <?php printf( /* Translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
    725725                                        '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
    726726                        </h4>
    727727
     
    740740                                $type = esc_html( $type );
    741741                        ?>
    742742                        <div class="dashboard-comment-wrap">
    743                         <?php /* translators: %1$s is type of comment, %2$s is link to the post */ ?>
     743                        <?php /* Translators: %1$s is type of comment, %2$s is link to the post */ ?>
    744744                        <h4 class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link." ".$comment_link ); ?></h4>
    745745                        <p class="comment-author"><?php comment_author_link(); ?></p>
    746746
     
    837837                $content = wp_html_excerpt($content, 50) . ' ...';
    838838
    839839                if ( $link )
    840                         /* translators: incoming links feed, %1$s is other person, %3$s is content */
     840                        /* Translators: incoming links feed, %1$s is other person, %3$s is content */
    841841                        $text = __( '%1$s linked here <a href="%2$s">saying</a>, "%3$s"' );
    842842                else
    843                         /* translators: incoming links feed, %1$s is other person, %3$s is content */
     843                        /* Translators: incoming links feed, %1$s is other person, %3$s is content */
    844844                        $text = __( '%1$s linked here saying, "%3$s"' );
    845845
    846846                if ( !empty($show_date) ) {
    847847                        if ( !empty($show_author) || !empty($show_summary) )
    848                                 /* translators: incoming links feed, %4$s is the date */
     848                                /* Translators: incoming links feed, %4$s is the date */
    849849                                $text .= ' ' . __( 'on %4$s' );
    850850                        $date = esc_html( strip_tags( $item->get_date() ) );
    851851                        $date = strtotime( $date );
     
    993993                if ( !isset($items[$item_key]) )
    994994                        continue;
    995995
    996                 // current bbPress feed item titles are: user on "topic title"
     996                // Current bbPress feed item titles are: user on "topic title"
    997997                if ( preg_match( '/&quot;(.*)&quot;/s', $item->get_title(), $matches ) )
    998998                        $title = $matches[1];
    999999                else // but let's make it forward compatible if things change
     
    10151015}
    10161016
    10171017/**
    1018  * Checks to see if all of the feed url in $check_urls are cached.
     1018 * Checks to see if all of the feed URL's in $check_urls are cached.
    10191019 *
    1020  * If $check_urls is empty, look for the rss feed url found in the dashboard
     1020 * If $check_urls is empty, look for the RSS feed URL found in the dashboard
    10211021 * widget optios of $widget_id. If cached, call $callback, a function that
    1022  * echoes out output for this widget. If not cache, echo a "Loading..." stub
     1022 * echoes output for this widget. If not cache, echo a "Loading..." stub
    10231023 * which is later replaced by AJAX call (see top of /wp-admin/index.php)
    10241024 *
    10251025 * @since 2.5.0
     
    12361236}
    12371237
    12381238/**
    1239  * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS).
     1239 * Empty function usable by plugins to output empty dashboard widget (to be populated later by JavaScript).
    12401240 */
    12411241function wp_dashboard_empty() {}
    12421242
  • wp-admin/includes/misc.php

     
    129129        $htaccess_file = $home_path.'.htaccess';
    130130
    131131        // If the file doesn't already exist check for write access to the directory and whether we have some rules.
    132         // else check for write access to the file.
     132        // Else check for write access to the file.
    133133        if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
    134134                if ( got_mod_rewrite() ) {
    135135                        $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
     
    544544 * @return bool
    545545 */
    546546function win_is_writable( $path ) {
    547         /* will work in despite of Windows ACLs bug
     547        /* Will work in despite of Windows ACLs bug
    548548         * NOTE: use a trailing slash for folders!!!
    549549         * see http://bugs.php.net/bug.php?id=27609
    550550         * see http://bugs.php.net/bug.php?id=30931
     
    554554                return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
    555555        else if ( is_dir( $path ) )
    556556                return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
    557         // check tmp file for read/write capabilities
     557        // Check tmp file for read/write capabilities
    558558        $should_delete_tmp_file = !file_exists( $path );
    559559        $f = @fopen( $path, 'a' );
    560560        if ( $f === false )
  • wp-admin/includes/class-wp-theme-install-list-table.php

     
    3131                        $tabs['search'] = __( 'Search Results' );
    3232                $tabs['upload'] = __( 'Upload' );
    3333                $tabs['featured'] = _x( 'Featured','Theme Installer' );
    34                 //$tabs['popular']  = _x( 'Popular','Theme Installer' );
     34                // $tabs['popular']  = _x( 'Popular','Theme Installer' );
    3535                $tabs['new']      = _x( 'Newest','Theme Installer' );
    3636                $tabs['updated']  = _x( 'Recently Updated','Theme Installer' );
    3737
    38                 $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
     38                $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a menu item.
    3939
    4040                $tabs = apply_filters( 'install_themes_tabs', $tabs );
    4141                $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
  • wp-admin/includes/class-wp-filesystem-ftpsockets.php

     
    2323                $this->method = 'ftpsockets';
    2424                $this->errors = new WP_Error();
    2525
    26                 //Check if possible to use ftp functions.
     26                //Check if possible to use FTP functions.
    2727                if ( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
    2828                                return false;
    2929                $this->ftp = new ftp();
     
    9797                if ( ! $this->ftp->fget($temphandle, $file) ) {
    9898                        fclose($temphandle);
    9999                        unlink($temp);
    100                         return ''; //Blank document, File does exist, Its just blank.
     100                        return ''; //Blank document, File does exist, It's just blank.
    101101                }
    102102
    103103                fseek($temphandle, 0); //Skip back to the start of the file being written to
     
    241241        }
    242242
    243243        function is_readable($file) {
    244                 //Get dir list, Check if the file is writable by the current user??
     244                //Get directory list, check if the file is writable by the current user??
    245245                return true;
    246246        }
    247247
    248248        function is_writable($file) {
    249                 //Get dir list, Check if the file is writable by the current user??
     249                //Get directory list, check if the file is writable by the current user??
    250250                return true;
    251251        }
    252252
  • wp-admin/includes/deprecated.php

     
    3737}
    3838
    3939/**
    40  * Calculates the new dimentions for a downsampled image.
     40 * Calculates the new dimensions for a downsampled image.
    4141 *
    4242 * @since 2.0.0
    4343 * @deprecated 3.0.0
     
    176176}
    177177
    178178/**
    179  * Adds Javascript required to make CodePress work on the theme/plugin editors.
     179 * Adds JavaScript required to make CodePress work on the theme/plugin editors.
    180180 *
    181181 * @since 2.8.0
    182182 * @deprecated 3.0.0
     
    210210        if ( !is_multisite() )
    211211                $level_key = $wpdb->get_blog_prefix() . 'user_level';
    212212        else
    213                 $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
     213                $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // Multisite site admins don't have user_levels
    214214
    215215        return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
    216216}
     
    263263        if ( !is_multisite() )
    264264                $level_key = $wpdb->get_blog_prefix() . 'user_level';
    265265        else
    266                 $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
     266                $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // Multisite site admins don't have user_levels
    267267
    268268        $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
    269269        if ( $exclude_zeros )
     
    283283        if ( !is_multisite() )
    284284                $level_key = $wpdb->get_blog_prefix() . 'user_level';
    285285        else
    286                 $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
     286                $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // Multisite site admins don't have user_levels
    287287
    288288        return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
    289289}
     
    533533         * @access public
    534534         */
    535535        function prepare_vars_for_template_usage() {
    536                 $this->search_term = stripslashes($this->search_term); // done with DB, from now on we want slashes gone
     536                $this->search_term = stripslashes($this->search_term); // Done with DB, from now on we want slashes gone
    537537        }
    538538
    539539        /**
     
    545545         * @access public
    546546         */
    547547        function do_paging() {
    548                 if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
     548                if ( $this->total_users_for_query > $this->users_per_page ) { // Have to page the results
    549549                        $args = array();
    550550                        if( ! empty($this->search_term) )
    551551                                $args['usersearch'] = urlencode($this->search_term);
  • wp-admin/includes/class-wp-upgrader.php

     
    1212 */
    1313
    1414/**
    15  * WordPress Upgrader class for Upgrading/Installing a local set of files via the Filesystem Abstraction classes from a Zip file.
     15 * WordPress Upgrader class for Upgrading/Installing a local set of files via the Filesystem Abstraction classes from a ZIP file.
    1616 *
    1717 * @TODO More Detailed docs, for methods as well.
    1818 *
     
    4545                $this->strings['fs_no_content_dir'] = __('Unable to locate WordPress Content directory (wp-content).');
    4646                $this->strings['fs_no_plugins_dir'] = __('Unable to locate WordPress Plugin directory.');
    4747                $this->strings['fs_no_themes_dir'] = __('Unable to locate WordPress Theme directory.');
    48                 /* translators: %s: directory name */
     48                /* Translators: %s: directory name */
    4949                $this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
    5050
    5151                $this->strings['download_failed'] = __('Download failed.');
     
    103103                        }
    104104                }
    105105                return true;
    106         } //end fs_connect();
     106        } //End fs_connect();
    107107
    108108        function download_package($package) {
    109109
    110110                if ( ! preg_match('!^(http|https|ftp)://!i', $package) && file_exists($package) ) //Local file or remote?
    111                         return $package; //must be a local file..
     111                        return $package; //Must be a local file..
    112112
    113113                if ( empty($package) )
    114114                        return new WP_Error('no_package', $this->strings['no_package']);
     
    145145                        $wp_filesystem->delete($working_dir, true);
    146146
    147147                // Unzip package to working directory
    148                 $result = unzip_file($package, $working_dir); //TODO optimizations, Copy when Move/Rename would suffice?
     148                $result = unzip_file($package, $working_dir); //TODO: optimizations, copy when Move/Rename would suffice?
    149149
    150150                // Once extracted, delete the package if required.
    151151                if ( $delete_package )
     
    179179                if ( is_wp_error($res) )
    180180                        return $res;
    181181
    182                 //Retain the Original source and destinations
     182                //Retain the original source and destinations
    183183                $remote_source = $source;
    184184                $local_destination = $destination;
    185185
    186186                $source_files = array_keys( $wp_filesystem->dirlist($remote_source) );
    187187                $remote_destination = $wp_filesystem->find_folder($local_destination);
    188188
    189                 //Locate which directory to copy to the new folder, This is based on the actual folder holding the files.
     189                //Locate which directory to copy to the new folder, this is based on the actual folder holding the files.
    190190                if ( 1 == count($source_files) && $wp_filesystem->is_dir( trailingslashit($source) . $source_files[0] . '/') ) //Only one folder? Then we want its contents.
    191191                        $source = trailingslashit($source) . trailingslashit($source_files[0]);
    192192                elseif ( count($source_files) == 0 )
    193193                        return new WP_Error('bad_package', $this->strings['bad_package']); //There are no files?
    194                 //else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
     194                // Else // Its only a single file, The upgrader will use the foldername of this file as the destination folder. Foldername is based on zip filename.
    195195
    196196                //Hook ability to change the source file location..
    197197                $source = apply_filters('upgrader_source_selection', $source, $remote_source, $this);
     
    221221                        else if ( ! $removed )
    222222                                return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
    223223                } elseif ( $wp_filesystem->exists($remote_destination) ) {
    224                         //If we're not clearing the destination folder and something exists there allready, Bail.
    225                         //But first check to see if there are actually any files in the folder.
     224                        //If we're not clearing the destination folder and something exists there allready, bail.
     225                        //First check to see if there are actually any files in the folder.
    226226                        $_files = $wp_filesystem->dirlist($remote_destination);
    227227                        if ( ! empty($_files) ) {
    228228                                $wp_filesystem->delete($remote_source, true); //Clear out the source files.
     
    259259                        return $res;
    260260                }
    261261
    262                 //Bombard the calling function will all the info which we've just used.
     262                //Bombard the calling function with all the info which we've just used.
    263263                return $this->result;
    264264        }
    265265
     
    351351}
    352352
    353353/**
    354  * Plugin Upgrader class for WordPress Plugins, It is designed to upgrade/install plugins from a local zip, remote zip URL, or uploaded zip file.
     354 * Plugin Upgrader class for WordPress plugins, It is designed to upgrade/install plugins from a local ZIP, remote ZIP URL, or uploaded ZIP file.
    355355 *
    356  * @TODO More Detailed docs, for methods as well.
     356 * TODO: More detailed docs, for methods as well.
    357357 *
    358358 * @package WordPress
    359359 * @subpackage Upgrader
     
    418418                        return false;
    419419                }
    420420
    421                 // Get the URL to the zip file
     421                // Get the URL to the ZIP file
    422422                $r = $current->response[ $plugin ];
    423423
    424424                add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
    425425                add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
    426                 //'source_selection' => array(&$this, 'source_selection'), //theres a track ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
     426                //'source_selection' => array(&$this, 'source_selection'), // There's a track ticket to move up the directory for ZIP's which are made a bit differently, useful for non-.org plugins.
    427427
    428428                $this->run(array(
    429429                                        'package' => $r->package,
     
    468468                $this->skin->bulk_header();
    469469
    470470                // Only start maintenance mode if running in Multisite OR the plugin is in use
    471                 $maintenance = is_multisite(); // @TODO: This should only kick in for individual sites if at all possible.
     471                $maintenance = is_multisite(); // TODO: This should only kick in for individual sites if at all possible.
    472472                foreach ( $plugins as $plugin )
    473473                        $maintenance = $maintenance || (is_plugin_active($plugin) && isset($current->response[ $plugin ]) ); // Only activate Maintenance mode if a plugin is active AND has an update available
    474474                if ( $maintenance )
     
    491491                                continue;
    492492                        }
    493493
    494                         // Get the URL to the zip file
     494                        // Get the URL to the ZIP file
    495495                        $r = $current->response[ $plugin ];
    496496
    497497                        $this->skin->plugin_active = is_plugin_active($plugin);
     
    529529                return $results;
    530530        }
    531531
    532         //return plugin info.
     532        // Return plugin info.
    533533        function plugin_info() {
    534534                if ( ! is_array($this->result) )
    535535                        return false;
    536536                if ( empty($this->result['destination_name']) )
    537537                        return false;
    538538
    539                 $plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
     539                $plugin = get_plugins('/' . $this->result['destination_name']); // Ensure to pass with leading slash
    540540                if ( empty($plugin) )
    541541                        return false;
    542542
    543                 $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
     543                $pluginfiles = array_keys($plugin); // Assume the requested plugin is the first in the list
    544544
    545545                return $this->result['destination_name'] . '/' . $pluginfiles[0];
    546546        }
    547547
    548         //Hooked to pre_install
     548        // Hooked to pre_install
    549549        function deactivate_plugin_before_upgrade($return, $plugin) {
    550550
    551                 if ( is_wp_error($return) ) //Bypass.
     551                if ( is_wp_error($return) ) // Bypass.
    552552                        return $return;
    553553
    554554                $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
     
    557557
    558558                if ( is_plugin_active($plugin) ) {
    559559                        $this->skin->feedback('deactivate_plugin');
    560                         //Deactivate the plugin silently, Prevent deactivation hooks from running.
     560                        // Deactivate the plugin silently, prevent deactivation hooks from running.
    561561                        deactivate_plugins($plugin, true);
    562562                }
    563563        }
    564564
    565         //Hooked to upgrade_clear_destination
     565        // Hooked to upgrade_clear_destination
    566566        function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
    567567                global $wp_filesystem;
    568568
    569569                if ( is_wp_error($removed) )
    570                         return $removed; //Pass errors through.
     570                        return $removed; // Pass errors through.
    571571
    572572                $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
    573573                if ( empty($plugin) )
     
    580580                        return $removed;
    581581
    582582                // If plugin is in its own directory, recursively delete the directory.
    583                 if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
     583                if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) // Base check on if plugin includes directory seperator AND that its not the root plugin folder
    584584                        $deleted = $wp_filesystem->delete($this_plugin_dir, true);
    585585                else
    586586                        $deleted = $wp_filesystem->delete($plugins_dir . $plugin);
     
    595595/**
    596596 * Theme Upgrader class for WordPress Themes, It is designed to upgrade/install themes from a local zip, remote zip URL, or uploaded zip file.
    597597 *
    598  * @TODO More Detailed docs, for methods as well.
     598 * TODO: More Detailed docs, for methods as well.
    599599 *
    600600 * @package WordPress
    601601 * @subpackage Upgrader
     
    717717                $this->skin->bulk_header();
    718718
    719719                // Only start maintenance mode if running in Multisite OR the theme is in use
    720                 $maintenance = is_multisite(); // @TODO: This should only kick in for individual sites if at all possible.
     720                $maintenance = is_multisite(); // TODO: This should only kick in for individual sites if at all possible.
    721721                foreach ( $themes as $theme )
    722722                        $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
    723723                if ( $maintenance )
     
    741741
    742742                        $this->skin->theme_info = $this->theme_info($theme);
    743743
    744                         // Get the URL to the zip file
     744                        // Get the URL to the ZIP file
    745745                        $r = $current->response[ $theme ];
    746746
    747747                        $options = array(
     
    787787
    788788                $theme = isset($theme['theme']) ? $theme['theme'] : '';
    789789
    790                 if ( $theme != get_stylesheet() ) //If not current
     790                if ( $theme != get_stylesheet() ) // If not current
    791791                        return $return;
    792                 //Change to maintenance mode now.
     792                // Change to maintenance mode now.
    793793                if ( ! $this->bulk )
    794794                        $this->maintenance_mode(true);
    795795
     
    804804                if ( $theme != get_stylesheet() ) //If not current
    805805                        return $return;
    806806
    807                 //Ensure stylesheet name hasnt changed after the upgrade:
    808                 // @TODO: Note, This doesnt handle the Template changing, or the Template name changing.
     807                // Ensure stylesheet name hasnt changed after the upgrade:
     808                // TODO: Note, This doesnt handle the Template changing, or the Template name changing.
    809809                if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
    810810                        $theme_info = $this->theme_info();
    811811                        $stylesheet = $this->result['destination_name'];
     
    813813                        switch_theme($template, $stylesheet, true);
    814814                }
    815815
    816                 //Time to remove maintenance mode
     816                // Time to remove maintenance mode
    817817                if ( ! $this->bulk )
    818818                        $this->maintenance_mode(false);
    819819                return $return;
     
    850850/**
    851851 * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combiantion with the wp-admin/includes/update-core.php file
    852852 *
    853  * @TODO More Detailed docs, for methods as well.
     853 * TODO: More Detailed docs, for methods as well.
    854854 *
    855855 * @package WordPress
    856856 * @subpackage Upgrader
     
    910910/**
    911911 * Generic Skin for the WordPress Upgrader classes. This skin is designed to be extended for specific purposes.
    912912 *
    913  * @TODO More Detailed docs, for methods as well.
     913 * TODO: More Detailed docs, for methods as well.
    914914 *
    915915 * @package WordPress
    916916 * @subpackage Upgrader
     
    997997/**
    998998 * Plugin Upgrader Skin for WordPress Plugin Upgrades.
    999999 *
    1000  * @TODO More Detailed docs, for methods as well.
     1000 * TODO: More Detailed docs, for methods as well.
    10011001 *
    10021002 * @package WordPress
    10031003 * @subpackage Upgrader
     
    12291229/**
    12301230 * Plugin Installer Skin for WordPress Plugin Installer.
    12311231 *
    1232  * @TODO More Detailed docs, for methods as well.
     1232 * TODO: More Detailed docs, for methods as well.
    12331233 *
    12341234 * @package WordPress
    12351235 * @subpackage Upgrader
     
    12931293/**
    12941294 * Theme Installer Skin for the WordPress Theme Installer.
    12951295 *
    1296  * @TODO More Detailed docs, for methods as well.
     1296 * TODO: More Detailed docs, for methods as well.
    12971297 *
    12981298 * @package WordPress
    12991299 * @subpackage Upgrader
     
    13151315
    13161316        function before() {
    13171317                if ( !empty($this->api) ) {
    1318                         /* translators: 1: theme name, 2: version */
     1318                        /* Translators: 1: theme name, 2: version */
    13191319                        $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme <strong>%1$s %2$s</strong>.'), $this->api->name, $this->api->version);
    13201320                }
    13211321        }
     
    13561356/**
    13571357 * Theme Upgrader Skin for WordPress Theme Upgrades.
    13581358 *
    1359  * @TODO More Detailed docs, for methods as well.
     1359 * TODO: More Detailed docs, for methods as well.
    13601360 *
    13611361 * @package WordPress
    13621362 * @subpackage Upgrader
     
    14061406/**
    14071407 * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if its a local file to the Upgrade/Installer functions.
    14081408 *
    1409  * @TODO More Detailed docs, for methods as well.
     1409 * TODO: More Detailed docs, for methods as well.
    14101410 *
    14111411 * @package WordPress
    14121412 * @subpackage Upgrader
     
    14281428                else if ( isset($_GET[$urlholder]) )
    14291429                        $this->filename = $_GET[$urlholder];
    14301430
    1431                 //Handle a newly uploaded file, Else assume its already been uploaded
     1431                // Handle a newly uploaded file, Else assume its already been uploaded
    14321432                if ( !empty($_FILES) ) {
    14331433                        $this->filename = wp_unique_filename( $uploads['basedir'], $this->filename );
    14341434                        $this->package = $uploads['basedir'] . '/' . $this->filename;
    14351435
    1436                         // Move the file to the uploads dir
     1436                        // Move the file to the uploads directory
    14371437                        if ( false === @ move_uploaded_file( $_FILES[$form]['tmp_name'], $this->package) )
    14381438                                wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
    14391439                } else {
  • wp-admin/includes/schema.php

     
    198198        $options = array(
    199199        'siteurl' => $guessurl,
    200200        'blogname' => __('My Site'),
    201         /* translators: blog tagline */
     201        /* Translators: blog tagline */
    202202        'blogdescription' => __('Just another WordPress site'),
    203203        'users_can_register' => 0,
    204204        'admin_email' => 'you@example.com',
     
    219219        'default_pingback_flag' => 1,
    220220        'default_post_edit_rows' => 20,
    221221        'posts_per_page' => 10,
    222         /* translators: default date format, see http://php.net/date */
     222        /* Translators: default date format, see http://php.net/date */
    223223        'date_format' => __('F j, Y'),
    224         /* translators: default time format, see http://php.net/date */
     224        /* Translators: default time format, see http://php.net/date */
    225225        'time_format' => __('g:i a'),
    226         /* translators: links last updated date format, see http://php.net/date */
     226        /* Translators: links last updated date format, see http://php.net/date */
    227227        'links_updated_date_format' => __('F j, Y g:i a'),
    228228        'links_recently_updated_prepend' => '<em>',
    229229        'links_recently_updated_append' => '</em>',
     
    356356        if ( !empty($insert) )
    357357                $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
    358358
    359         // in case it is set, but blank, update "home"
     359        // In case it is set, but blank, update "home"
    360360        if ( !__get_option('home') ) update_option('home', $guessurl);
    361361
    362362        // Delete unused options
     
    364364        foreach ( $unusedoptions as $option )
    365365                delete_option($option);
    366366
    367         // delete obsolete magpie stuff
     367        // Delete obsolete magpie stuff
    368368        $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
    369369}
    370370
     
    393393        // Add roles
    394394
    395395        // Dummy gettext calls to get strings in the catalog.
    396         /* translators: user role */
     396        /* Translators: user role */
    397397        _x('Administrator', 'User role');
    398         /* translators: user role */
     398        /* Translators: user role */
    399399        _x('Editor', 'User role');
    400         /* translators: user role */
     400        /* Translators: user role */
    401401        _x('Author', 'User role');
    402         /* translators: user role */
     402        /* Translators: user role */
    403403        _x('Contributor', 'User role');
    404         /* translators: user role */
     404        /* Translators: user role */
    405405        _x('Subscriber', 'User role');
    406406
    407407        add_role('administrator', 'Administrator');
     
    624624}
    625625
    626626/**
    627  * populate network settings
     627 * Populate network settings
    628628 *
    629629 * @since 3.0.0
    630630 *
     
    641641        if ( '' == $site_name )
    642642                $errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
    643643
    644         // check for network collision
     644        // Check for network collision
    645645        if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
    646646                $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
    647647
     
    652652        if ( $errors->get_error_code() )
    653653                return $errors;
    654654
    655         // set up site tables
     655        // Set up site tables
    656656        $template = get_option( 'template' );
    657657        $stylesheet = get_option( 'stylesheet' );
    658658        $allowed_themes = array( $stylesheet => true );
     
    710710                'wpmu_upgrade_site' => $wp_db_version,
    711711                'welcome_email' => $welcome_email,
    712712                'first_post' => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ),
    713                 // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
     713                // TODO: network admins should have a method of editing the network siteurl (used for cookie hash)
    714714                'siteurl' => get_option( 'siteurl' ) . '/',
    715715                'add_new_users' => '0',
    716716                'upload_space_check_disabled' => '0',
  • wp-admin/includes/comment.php

     
    9999 * @since 2.3.0
    100100 * @uses $wpdb
    101101 *
    102  * @param int|array $post_id Either a single Post ID or an array of Post IDs
    103  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
     102 * @param int|array $post_id Either a single post ID or an array of post ID's
     103 * @return int|array Either a single posts pending comments as an int or an array of int's keyed on the post IDs
    104104 */
    105105function get_pending_comments_num( $post_id ) {
    106106        global $wpdb;
  • wp-admin/includes/theme.php

     
    8787        if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
    8888                return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
    8989
    90         //Get the base plugin folder
     90        // Get the base plugin folder
    9191        $themes_dir = $wp_filesystem->wp_themes_dir();
    9292        if ( empty($themes_dir) )
    9393                return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
     
    200200}
    201201
    202202/**
    203  * Tidies a filename for url display by the theme editor.
     203 * Cleans up a filename for URL display by the theme editor.
    204204 *
    205205 * @since 2.9.0
    206206 * @access private
     
    258258}
    259259
    260260/**
    261  * Retrieve list of WordPress theme features (aka theme tags)
     261 * Retrieve list of WordPress theme features (AKA theme tags)
    262262 *
    263263 * @since 3.1.0
    264264 *
    265  * @return array  Array of features keyed by category with translations keyed by slug.
     265 * @return array Array of features keyed by category with translations keyed by slug.
    266266 */
    267267function get_theme_feature_list() {
    268268        // Hard-coded list is used if api not accessible.
     
    401401                        $res = new WP_Error('themes_api_failed', __('An unknown error occurred.'), wp_remote_retrieve_body( $request ) );
    402402                }
    403403        }
    404         //var_dump(array($args, $res));
     404        // var_dump(array($args, $res));
    405405        return apply_filters('themes_api_result', $res, $action, $args);
    406406}
    407407
  • wp-admin/includes/meta-boxes.php

     
    11<?php
    22
    3 // -- Post related Meta Boxes
     3// -- Post Related Meta Boxes
    44
    55/**
    66 * Display post submit form fields.
     
    155155</div><?php // /misc-pub-section ?>
    156156
    157157<?php
    158 // translators: Publish box date formt, see http://php.net/date
     158// Translators: Publish box date formt, see http://php.net/date
    159159$datef = __( 'M j, Y @ G:i' );
    160160if ( 0 != $post->ID ) {
    161         if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
     161        if ( 'future' == $post->post_status ) { // Scheduled for publishing at a future date
    162162                $stamp = __('Scheduled for: <b>%1$s</b>');
    163         } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
     163        } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // Already published
    164164                $stamp = __('Published on: <b>%1$s</b>');
    165         } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
     165        } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // Draft, 1 or more saves, no date specified
    166166                $stamp = __('Publish <b>immediately</b>');
    167         } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
     167        } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // Draft, 1 or more saves, future date specified
    168168                $stamp = __('Schedule for: <b>%1$s</b>');
    169169        } else { // draft, 1 or more saves, date specified
    170170                $stamp = __('Publish on: <b>%1$s</b>');
    171171        }
    172172        $date = date_i18n( $datef, strtotime( $post->post_date ) );
    173 } else { // draft (no saves, and thus no date specified)
     173} else { // Draft (no saves, and thus no date specified)
    174174        $stamp = __('Publish <b>immediately</b>');
    175175        $date = date_i18n( $datef, strtotime( current_time('mysql') ) );
    176176}
     
    563563<label class="screen-reader-text" for="parent_id"><?php _e('Parent') ?></label>
    564564<?php echo $pages; ?>
    565565<?php
    566                 } // end empty pages check
    567         } // end hierarchical check.
     566                } // End empty pages check
     567        } // End hierarchical check.
    568568        if ( 'page' == $post->post_type && 0 != count( get_page_templates() ) ) {
    569569                $template = !empty($post->page_template) ? $post->page_template : false;
    570570                ?>
     
    597597
    598598<div id="minor-publishing">
    599599
    600 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
     600<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with return key ?>
    601601<div style="display:none;">
    602602<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
    603603</div>
     
    754754?>
    755755<table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
    756756        <tr>
    757                 <th style="width: 20%;" scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
     757                <th style="width: 20%;" scope="row"><label for="link_rel"><?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
    758758                <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
    759759        </tr>
    760760        <tr>
    761761                <td colspan="2">
    762762                        <table cellpadding="3" cellspacing="5" class="form-table">
    763763                                <tr>
    764                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </th>
     764                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </th>
    765765                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </span></legend>
    766766                                                <label for="me">
    767767                                                <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
     
    769769                                        </fieldset></td>
    770770                                </tr>
    771771                                <tr>
    772                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </th>
     772                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </th>
    773773                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </span></legend>
    774774                                                <label for="contact">
    775                                                 <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
     775                                                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
    776776                                                <label for="acquaintance">
    777                                                 <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> />  <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
     777                                                <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> />  <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
    778778                                                <label for="friend">
    779                                                 <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
     779                                                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
    780780                                                <label for="friendship">
    781                                                 <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
     781                                                <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> /> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
    782782                                        </fieldset></td>
    783783                                </tr>
    784784                                <tr>
    785                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
    786                                         <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </span></legend>
     785                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
     786                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </span></legend>
    787787                                                <label for="met">
    788788                                                <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
    789                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?></label>
     789                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?></label>
    790790                                        </fieldset></td>
    791791                                </tr>
    792792                                <tr>
    793                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
    794                                         <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </span></legend>
     793                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
     794                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </span></legend>
    795795                                                <label for="co-worker">
    796796                                                <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
    797                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?></label>
     797                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?></label>
    798798                                                <label for="colleague">
    799799                                                <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
    800                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?></label>
     800                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?></label>
    801801                                        </fieldset></td>
    802802                                </tr>
    803803                                <tr>
    804                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </th>
    805                                         <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
     804                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </th>
     805                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
    806806                                                <label for="co-resident">
    807807                                                <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident'); ?> />
    808                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?></label>
     808                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?></label>
    809809                                                <label for="neighbor">
    810810                                                <input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor'); ?> />
    811                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?></label>
     811                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?></label>
    812812                                                <label for="geographical">
    813813                                                <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical'); ?> />
    814                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
     814                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
    815815                                        </fieldset></td>
    816816                                </tr>
    817817                                <tr>
    818                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
    819                                         <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
     818                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
     819                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
    820820                                                <label for="child">
    821821                                                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?>  />
    822                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
     822                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
    823823                                                <label for="kin">
    824824                                                <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?>  />
    825                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
     825                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
    826826                                                <label for="parent">
    827827                                                <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />
    828                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?></label>
     828                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?></label>
    829829                                                <label for="sibling">
    830830                                                <input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling'); ?> />
    831                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?></label>
     831                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?></label>
    832832                                                <label for="spouse">
    833833                                                <input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse'); ?> />
    834                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?></label>
     834                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?></label>
    835835                                                <label for="family">
    836836                                                <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family'); ?> />
    837                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
     837                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
    838838                                        </fieldset></td>
    839839                                </tr>
    840840                                <tr>
    841                                         <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </th>
    842                                         <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
     841                                        <th scope="row"> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </th>
     842                                        <td><fieldset><legend class="screen-reader-text"><span> <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
    843843                                                <label for="muse">
    844844                                                <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
    845                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?></label>
     845                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?></label>
    846846                                                <label for="crush">
    847847                                                <input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />
    848                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('crush') ?></label>
     848                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('crush') ?></label>
    849849                                                <label for="date">
    850850                                                <input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />
    851                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('date') ?></label>
     851                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('date') ?></label>
    852852                                                <label for="romantic">
    853853                                                <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
    854                                                 <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?></label>
     854                                                <?php /* Translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?></label>
    855855                                        </fieldset></td>
    856856                                </tr>
    857857                        </table>
  • wp-admin/includes/image-edit.php

     
    323323        if ( !is_array($changes) )
    324324                return $img;
    325325
    326         // expand change operations
     326        // Expand change operations
    327327        foreach ( $changes as $key => $obj ) {
    328328                if ( isset($obj->r) ) {
    329329                        $obj->type = 'rotate';
     
    341341                $changes[$key] = $obj;
    342342        }
    343343
    344         // combine operations
     344        // Combine operations
    345345        if ( count($changes) > 1 ) {
    346346                $filtered = array($changes[0]);
    347347                for ( $i = 0, $j = 1; $j < count($changes); $j++ ) {
     
    365365                unset($filtered);
    366366        }
    367367
    368         // image resource before applying the changes
     368        // Image resource before applying the changes
    369369        $img = apply_filters('image_edit_before_change', $img, $changes);
    370370
    371371        foreach ( $changes as $operation ) {
     
    401401        if ( $changes )
    402402                $img = image_edit_apply_changes($img, $changes);
    403403
    404         // scale the image
     404        // Scale the image
    405405        $w = imagesx($img);
    406406        $h = imagesy($img);
    407407        $ratio = _image_get_preview_ratio($w, $h);
     
    438438
    439439                if ( $parts['basename'] != $data['file'] ) {
    440440                        if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
    441                                 // delete only if it's edited image
     441                                // Delete only if it's an edited image
    442442                                if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
    443443                                        $delpath = apply_filters('wp_delete_file', $file);
    444444                                        @unlink($delpath);
     
    463463                        $data = $backup_sizes["$default_size-orig"];
    464464                        if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
    465465                                if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
    466                                         // delete only if it's edited image
     466                                        // Delete only if it's  an edited image
    467467                                        if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
    468468                                                $delpath = apply_filters( 'wp_delete_file', path_join($parts['dirname'], $meta['sizes'][$default_size]['file']) );
    469469                                                @unlink($delpath);
     
    513513                $sX = imagesx($img);
    514514                $sY = imagesy($img);
    515515
    516                 // check if it has roughly the same w / h ratio
     516                // Check if it has roughly the same width/height ratio
    517517                $diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
    518518                if ( -0.1 < $diff && $diff < 0.1 ) {
    519                         // scale the full size image
     519                        // Scale the full size image
    520520                        $dst = wp_imagecreatetruecolor($fwidth, $fheight);
    521521                        if ( imagecopyresampled( $dst, $img, 0, 0, 0, 0, $fwidth, $fheight, $sX, $sY ) ) {
    522522                                imagedestroy($img);
     
    549549        if ( !is_array($backup_sizes) )
    550550                $backup_sizes = array();
    551551
    552         // generate new filename
     552        // Generate new filename
    553553        $path = get_attached_file($post_id);
    554554        $path_parts = pathinfo( $path );
    555555        $filename = $path_parts['filename'];
     
    575575                }
    576576        }
    577577
    578         // save the full-size file, also needed to create sub-sizes
     578        // Save the full-size file, also needed to create sub-sizes
    579579        if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
    580580                $return->error = esc_js( __('Unable to save the image.') );
    581581                return $return;
  • wp-admin/includes/class-wp-plugins-list-table.php

     
    119119
    120120                $this->items = array();
    121121                foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
    122                         // Translate, Don't Apply Markup, Sanitize HTML
     122                        // Translate, don't apply markup, sanitize HTML
    123123                        $this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
    124124                }
    125125
  • wp-admin/includes/theme-install.php

     
    2020);
    2121
    2222/**
    23  * Retrieve list of WordPress theme features (aka theme tags)
     23 * Retrieve list of WordPress theme features (AKA theme tags)
    2424 *
    2525 * @since 2.8.0
    2626 *
     
    133133
    134134        $name = wp_kses($theme->name, $themes_allowedtags);
    135135        $desc = wp_kses($theme->description, $themes_allowedtags);
    136         //if ( strlen($desc) > 30 )
     136        // if ( strlen($desc) > 30 )
    137137        //      $desc =  substr($desc, 0, 15) . '<span class="dots">...</span><span>' . substr($desc, -15) . '</span>';
    138138
    139139        $preview_link = $theme->preview_url . '?TB_iframe=true&amp;width=600&amp;height=400';
  • wp-admin/includes/widgets.php

     
    100100
    101101        $params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";
    102102        $params[0]['after_widget'] = "</div>";
    103         $params[0]['before_title'] = "%BEG_OF_TITLE%"; // deprecated
    104         $params[0]['after_title'] = "%END_OF_TITLE%"; // deprecated
     103        $params[0]['before_title'] = "%BEG_OF_TITLE%"; // Deprecated
     104        $params[0]['after_title'] = "%END_OF_TITLE%"; // Deprecated
    105105        if ( is_callable( $wp_registered_widgets[$widget_id]['callback'] ) ) {
    106106                $wp_registered_widgets[$widget_id]['_callback'] = $wp_registered_widgets[$widget_id]['callback'];
    107107                $wp_registered_widgets[$widget_id]['callback'] = 'wp_widget_control';
     
    162162
    163163        // We aren't showing a widget control, we're outputing a template for a mult-widget control
    164164        if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
    165                 // number == -1 implies a template where id numbers are replaced by a generic '__i__'
     165                // Number == -1 implies a template where id numbers are replaced by a generic '__i__'
    166166                $control['params'][0]['number'] = -1;
    167                 // with id_base widget id's are constructed like {$id_base}-{$id_number}
     167                // With id_base widget ID's are constructed like {$id_base}-{$id_number}
    168168                if ( isset($control['id_base']) )
    169169                        $id_format = $control['id_base'] . '-__i__';
    170170        }
  • wp-admin/includes/update-core.php

     
    11<?php
    22/**
    3  * WordPress core upgrade functionality.
     3 * WordPress Core Upgrade Functionality.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    249249 *
    250250 * The contents of this array indicate any new bundled plugins/themes which
    251251 * should be installed with the WordPress Upgrade. These items will not be
    252  * re-installed in future upgrades, this behaviour is controlled by the
     252 * re-installed in future upgrades, this behavior is controlled by the
    253253 * introduced version present here being older than the current installed version.
    254254 *
    255255 * The content of this array should follow the following format:
     
    362362        $wp_filesystem->delete($maintenance_file);
    363363        $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
    364364
    365         // Copy new versions of WP files into place.
     365        // Copy new versions of WordPress files into place.
    366366        $result = _copy_dir($from . $distro, $to, array('wp-content') );
    367367
    368368        // Custom Content Directory needs updating now.
     
    414414
    415415                                        $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
    416416                                        $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
    417                                         if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.
     417                                        if ( is_wp_error($_result) ) // If an error occurs partway through this final step, keep the error flowing through, but keep process going.
    418418                                                $result = $_result;
    419419                                }
    420420                        }
    421                 } //end foreach
     421                } // end foreach
    422422        }
    423423
    424424        // Handle $result error from the above blocks
  • wp-admin/includes/class-wp-themes-list-table.php

     
    7676
    7777                                return;
    7878                        }
    79                         // else, fallthrough. install_themes doesn't help if you can't enable it.
     79                        // Else, fallthrough. install_themes doesn't help if you can't enable it.
    8080                } else {
    8181                        if ( current_user_can( 'install_themes' ) ) {
    8282                                printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ), admin_url( 'theme-install.php' ) );
     
    179179<?php endif; ?>
    180180                </a>
    181181<h3><?php
    182         /* translators: 1: theme title, 2: theme version, 3: theme author */
     182        /* Translators: 1: theme title, 2: theme version, 3: theme author */
    183183        printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
    184184<p class="description"><?php echo $description; ?></p>
    185185<span class='action-links'><?php echo $actions ?></span>
    186186        <?php if ( current_user_can( 'edit_themes' ) && $parent_theme ) {
    187         /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
     187        /* Translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
    188188        <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme ); ?></p>
    189189<?php } else { ?>
    190190        <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p>
     
    193193<p><?php _e( 'Tags:' ); ?> <?php echo join( ', ', $tags ); ?></p>
    194194<?php endif; ?>
    195195                <?php theme_update_available( $themes[$theme_name] ); ?>
    196 <?php endif; // end if not empty theme_name ?>
     196<?php endif; // End if not empty theme_name ?>
    197197        </td>
    198 <?php } // end foreach $cols ?>
     198<?php } // End foreach $cols ?>
    199199</tr>
    200 <?php } // end foreach $table
     200<?php } // End foreach $table
    201201        }
    202202
    203203        function search_theme( $theme ) {
  • wp-admin/includes/class-wp-comments-list-table.php

     
    348348                }
    349349
    350350                echo '<div class="submitted-on">';
    351                 /* translators: 2: comment date, 3: comment time */
     351                /* Translators: 2: comment date, 3: comment time */
    352352                printf( __( 'Submitted on <a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
    353                         /* translators: comment date format. See http://php.net/date */ get_comment_date( __( 'Y/m/d' ) ),
    354                         /* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
     353                        /* Translators: comment date format. See http://php.net/date */ get_comment_date( __( 'Y/m/d' ) ),
     354                        /* Translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
    355355
    356356                if ( $comment->comment_parent ) {
    357357                        $parent = get_comment( $comment->comment_parent );
     
    374374                }
    375375
    376376                if ( $user_can ) {
    377                         // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
     377                        // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
    378378                        $actions = array(
    379379                                'approve' => '', 'unapprove' => '',
    380380                                'reply' => '',
     
    395395                        }
    396396
    397397                        if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
    398                                 $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
     398                                $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* Translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
    399399                        } elseif ( 'spam' == $the_comment_status ) {
    400400                                $actions['unspam'] = "<a href='$unspam_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . _x( 'Not Spam', 'comment' ) . '</a>';
    401401                        } elseif ( 'trash' == $the_comment_status ) {
     
    423423                                ++$i;
    424424                                ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
    425425
    426                                 // Reply and quickedit need a hide-if-no-js span when not added with ajax
     426                                // Reply and quickedit need a hide-if-no-js span when not added with AJAX
    427427                                if ( ( 'reply' == $action || 'quickedit' == $action ) && ! defined('DOING_AJAX') )
    428428                                        $action .= ' hide-if-no-js';
    429429                                elseif ( ( $action == 'untrash' && $the_comment_status == 'trash' ) || ( $action == 'unspam' && $the_comment_status == 'spam' ) ) {
  • wp-admin/includes/template.php

     
    257257        return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
    258258}
    259259
    260 // adds hidden fields with the data for use in the inline editor for posts and pages
     260// Adds hidden fields with the data for use in the inline editor for posts and pages
    261261/**
    262262 * {@internal Missing Short Description}}
    263263 *
     
    323323 * @param unknown_type $mode
    324324 */
    325325function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) {
    326         // allow plugin to replace the popup content
     326        // Allow plugin to replace the popup content
    327327        $content = apply_filters( 'wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode) );
    328328
    329329        if ( ! empty($content) ) {
     
    432432        <tbody id="the-list" class="list:meta">
    433433        <tr><td></td></tr>
    434434        </tbody>
    435 </table>'; //TBODY needed for list-manipulation JS
     435</table>'; // TBODY needed for list-manipulation JavaScript
    436436                return;
    437437        }
    438438        $count = 0;
     
    479479
    480480        if ( is_serialized( $entry['meta_value'] ) ) {
    481481                if ( is_serialized_string( $entry['meta_value'] ) ) {
    482                         // this is a serialized string, so we should display it
     482                        // This is a serialized string, so we should display it
    483483                        $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
    484484                } else {
    485                         // this is a serialized array/object so we should NOT display it
     485                        // This is a serialized array/object so we should NOT display it
    486486                        --$count;
    487487                        return;
    488488                }
     
    622622        $minute = '<input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
    623623
    624624        echo '<div class="timestamp-wrap">';
    625         /* translators: 1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input */
     625        /* Translators: 1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input */
    626626        printf(__('%1$s%2$s, %3$s @ %4$s : %5$s'), $month, $day, $year, $hour, $minute);
    627627
    628628        echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
     
    16041604 *
    16051605 */
    16061606function iframe_footer() {
    1607         //We're going to hide any footer output on iframe pages, but run the hooks anyway since they output Javascript or other needed content. ?>
     1607        // We're going to hide any footer output on iframe pages, but run the hooks anyway since they output JavaScript or other needed content. ?>
    16081608        <div class="hidden">
    16091609<?php
    16101610        do_action('admin_footer', '');
     
    16881688 * @since 3.0.0
    16891689 *
    16901690 * @param string $screen The name of the screen
    1691  * @return object An object containing the safe screen name and id
     1691 * @return object An object containing the safe screen name and ID
    16921692 */
    16931693function convert_to_screen( $screen ) {
    16941694        $screen = str_replace( array('.php', '-new', '-add', '-network', '-user' ), '', $screen);
     
    18581858        if ( is_string($screen) )
    18591859                $screen = convert_to_screen($screen);
    18601860
    1861         // Back compat for plugins using the filter instead of add_screen_option()
     1861        // Back compatibility for plugins using the filter instead of add_screen_option()
    18621862        $columns = apply_filters('screen_layout_columns', array(), $screen->id, $screen);
    18631863        if ( !empty($columns) && isset($columns[$screen->id]) )
    18641864                add_screen_option('layout_columns', array('max' => $columns[$screen->id]) );
     
    19381938        else
    19391939                $per_page = apply_filters( $option, $per_page );
    19401940
    1941         // Back compat
     1941        // Back compatibility
    19421942        if ( isset( $screen->post_type ) )
    19431943                $per_page = apply_filters( 'edit_posts_per_page', $per_page, $screen->post_type );
    19441944
     
    21952195        endswitch;
    21962196        $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
    21972197
    2198         // Default the id attribute to $name unless an id was specifically provided in $other_attributes
     2198        // Default the ID attribute to $name unless an ID was specifically provided in $other_attributes
    21992199        $id = $name;
    22002200        if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {
    22012201                $id = $other_attributes['id'];
  • wp-admin/includes/user.php

     
    130130
    131131        $errors = new WP_Error();
    132132
    133         /* checking that username has been typed */
     133        /* Checking that username has been typed */
    134134        if ( $user->user_login == '' )
    135135                $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ));
    136136
    137         /* checking the password has been typed twice */
     137        /* Checking the password has been typed twice */
    138138        do_action_ref_array( 'check_passwords', array ( $user->user_login, & $pass1, & $pass2 ));
    139139
    140140        if ( $update ) {
     
    153153        if ( false !== strpos( stripslashes($pass1), "\\" ) )
    154154                $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
    155155
    156         /* checking the password has been typed twice the same */
     156        /* Checking the password has been typed twice the same */
    157157        if ( $pass1 != $pass2 )
    158158                $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in the two password fields.' ), array( 'form-field' => 'pass1' ) );
    159159
     
    166166        if ( !$update && username_exists( $user->user_login ) )
    167167                $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
    168168
    169         /* checking e-mail address */
     169        /* Checking e-mail address */
    170170        if ( empty( $user->user_email ) ) {
    171171                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
    172172        } elseif ( !is_email( $user->user_email ) ) {
     
    274274
    275275        $id = (int) $id;
    276276
    277         // allow for transaction statement
     277        // Allow for transaction statement
    278278        do_action('delete_user', $id);
    279279
    280280        if ( 'novalue' === $reassign || null === $reassign ) {
     
    309309                $wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = $id AND meta_key = '{$level_key}'");
    310310        }
    311311
    312         // allow for commit transaction
     312        // Allow for commit transaction
    313313        do_action('deleted_user', $id);
    314314
    315315        return true;
     
    335335 */
    336336function default_password_nag_handler($errors = false) {
    337337        global $user_ID;
    338         if ( ! get_user_option('default_password_nag') ) //Short circuit it.
     338        if ( ! get_user_option('default_password_nag') ) // Short circuit it.
    339339                return;
    340340
    341         //get_user_setting = JS saved UI setting. else no-js-falback code.
     341        // get_user_setting = JS saved UI setting. else no-js-falback code.
    342342        if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
    343343                delete_user_setting('default_password_nag');
    344344                update_user_option($user_ID, 'default_password_nag', false, true);
     
    350350 * @since 2.8.0
    351351 */
    352352function default_password_nag_edit_user($user_ID, $old_data) {
    353         if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
     353        if ( ! get_user_option('default_password_nag', $user_ID) ) // Short circuit it.
    354354                return;
    355355
    356356        $new_data = get_userdata($user_ID);
    357357
    358         if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
     358        if ( $new_data->user_pass != $old_data->user_pass ) { // Remove the nag if the password has been changed.
    359359                delete_user_setting('default_password_nag', $user_ID);
    360360                update_user_option($user_ID, 'default_password_nag', false, true);
    361361        }
     
    367367 */
    368368function default_password_nag() {
    369369        global $pagenow;
    370         if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it.
     370        if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) // Short circuit it.
    371371                return;
    372372
    373373        echo '<div class="error default-password-nag">';
  • wp-admin/includes/media.php

     
    1515 */
    1616function media_upload_tabs() {
    1717        $_default_tabs = array(
    18                 'type' => __('From Computer'), // handler action suffix => tab text
     18                'type' => __('From Computer'), // Handler action suffix => tab text
    1919                'type_url' => __('From URL'),
    2020                'gallery' => __('Gallery'),
    2121                'library' => __('Media Library')
     
    211211        $title = $name;
    212212        $content = '';
    213213
    214         // use image exif/iptc data for title and caption defaults if possible
     214        // Use image exif/iptc data for title and caption defaults if possible
    215215        if ( $image_meta = @wp_read_image_metadata($file) ) {
    216216                if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
    217217                        $title = $image_meta['title'];
     
    262262        $title = preg_replace('/\.[^.]+$/', '', basename($file));
    263263        $content = '';
    264264
    265         // use image exif/iptc data for title and caption defaults if possible
     265        // Use image exif/iptc data for title and caption defaults if possible
    266266        if ( $image_meta = @wp_read_image_metadata($file) ) {
    267267                if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
    268268                        $title = $image_meta['title'];
     
    292292/**
    293293 * {@internal Missing Short Description}}
    294294 *
    295  * Wrap iframe content (produced by $content_func) in a doctype, html head/body
     295 * Wrap iframe content (produced by $content_func) in a doctype, HTML head/body
    296296 * etc any additional function args will be passed to content_func.
    297297 *
    298298 * @since 2.5.0
     
    448448                        $image_alt = get_post_meta($attachment_id, '_wp_attachment_image_alt', true);
    449449                        if ( $image_alt != stripslashes($attachment['image_alt']) ) {
    450450                                $image_alt = wp_strip_all_tags( stripslashes($attachment['image_alt']), true );
    451                                 // update_meta expects slashed
     451                                // Update_meta expects slashed
    452452                                update_post_meta( $attachment_id, '_wp_attachment_image_alt', addslashes($image_alt) );
    453453                        }
    454454                }
     
    572572                $tmp = download_url( $file );
    573573
    574574                // Set variables for storage
    575                 // fix file filename for query strings
     575                // Fix file filename for query strings
    576576                preg_match('/[^\?]+\.(jpg|JPG|jpe|JPE|jpeg|JPEG|gif|GIF|png|PNG)/', $file, $matches);
    577577                $file_array['name'] = basename($matches[0]);
    578578                $file_array['tmp_name'] = $tmp;
     
    583583                        $file_array['tmp_name'] = '';
    584584                }
    585585
    586                 // do the validation and storage stuff
     586                // Do the validation and storage stuff
    587587                $id = media_handle_sideload( $file_array, $post_id, $desc );
    588588                // If error storing permanently, unlink
    589589                if ( is_wp_error($id) ) {
     
    14761476
    14771477if ( $flash ) :
    14781478
    1479 // Set the post params, which SWFUpload will post back with the file, and pass
     1479// Set the post parameters, which SWFUpload will post back with the file, and pass
    14801480// them through a filter.
    14811481$post_params = array(
    14821482                "post_id" => $post_id,
     
    15361536                        swfupload_pre_load_handler: swfuploadPreLoad,
    15371537                        swfupload_load_failed_handler: swfuploadLoadFailed,
    15381538                        custom_settings : {
    1539                                 degraded_element_id : "html-upload-ui", // id of the element displayed when swfupload is unavailable
    1540                                 swfupload_element_id : "flash-upload-ui" // id of the element displayed when swfupload is available
     1539                                degraded_element_id : "html-upload-ui", // ID of the element displayed when swfupload is unavailable
     1540                                swfupload_element_id : "flash-upload-ui" // ID of the element displayed when swfupload is available
    15411541                        },
    15421542                        debug: false
    15431543                };
     
    22942294        echo '<p class="upload-html-bypass hide-if-no-js">';
    22952295        _e('You are using the Browser uploader.');
    22962296        if ( $flash ) {
    2297                 // the user manually selected the browser uploader, so let them switch back to Flash
     2297                // The user manually selected the browser uploader, so let them switch back to Flash
    22982298                echo ' ';
    22992299                printf( __('Try the <a href="%s">Flash uploader</a> instead.'), esc_url(add_query_arg('flash', 1)) );
    23002300        }
  • wp-admin/includes/ms.php

     
    11<?php
    22/**
    3  * Multisite administration functions.
     3 * Multisite Administration Functions.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
     
    134134                restore_current_blog();
    135135}
    136136
    137 // @todo Merge with wp_delete_user() ?
     137// TODO: Merge with wp_delete_user() ?
    138138function wpmu_delete_user( $id ) {
    139139        global $wpdb;
    140140
     
    171171
    172172        clean_user_cache( $id );
    173173
    174         // allow for commit transaction
     174        // Allow for commit transaction
    175175        do_action( 'deleted_user', $id );
    176176
    177177        return true;
     
    409409
    410410        if ( $space > 1000 ) {
    411411                $space = number_format( $space / 1024 );
    412                 /* translators: Gigabytes */
     412                /* Translators: Gigabytes */
    413413                $space .= __( 'GB' );
    414414        } else {
    415                 /* translators: Megabytes */
     415                /* Translators: Megabytes */
    416416                $space .= __( 'MB' );
    417417        }
    418418        ?>
  • wp-admin/includes/export.php

     
    7676                        $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
    7777        }
    7878
    79         // grab a snapshot of post IDs, just in case it changes during the export
     79        // Grab a snapshot of post IDs, just in case it changes during the export
    8080        $post_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} $join WHERE $where" );
    8181
    82         // get the requested terms ready, empty unless posts filtered by category or all content
     82        // Get the requested terms ready, empty unless posts filtered by category or all content
    8383        $cats = $tags = $terms = array();
    8484        if ( isset( $term ) && $term ) {
    8585                $cat = get_term( $term['term_id'], 'category' );
     
    9292                $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
    9393                $custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
    9494
    95                 // put categories in order with no child going before its parent
     95                // Put categories in order with no child going before its parent
    9696                while ( $cat = array_shift( $categories ) ) {
    9797                        if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
    9898                                $cats[$cat->term_id] = $cat;
     
    100100                                $categories[] = $cat;
    101101                }
    102102
    103                 // put terms in order with no child going before its parent
     103                // Put terms in order with no child going before its parent
    104104                while ( $t = array_shift( $custom_terms ) ) {
    105105                        if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
    106106                                $terms[$t->term_id] = $t;
     
    348348        global $wp_query;
    349349        $wp_query->in_the_loop = true; // Fake being in the loop.
    350350
    351         // fetch 20 posts at a time rather than loading the entire table into memory
     351        // Fetch 20 posts at a time rather than loading the entire table into memory
    352352        while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
    353353        $where = "WHERE ID IN (" . join( ',', $next_posts ) . ")";
    354354        $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
  • wp-admin/includes/image.php

     
    77 */
    88
    99/**
    10  * Create a thumbnail from an Image given a maximum side size.
     10 * Create a thumbnail from an image given a maximum side size.
    1111 *
    1212 * This function can handle most image file formats which PHP supports. If PHP
    1313 * does not have the functionality to save in a file of the same format, the
    14  * thumbnail will be created as a jpeg.
     14 * thumbnail will be created as a JPEG.
    1515 *
    1616 * @since 1.2.0
    1717 *
    18  * @param mixed $file Filename of the original image, Or attachment id.
     18 * @param mixed $file Filename of the original image, or attachment id.
    1919 * @param int $max_side Maximum length of a single side for the thumbnail.
    2020 * @param mixed $deprecated Never used.
    2121 * @return string Thumbnail path on success, Error string on failure.
     
    2828}
    2929
    3030/**
    31  * Crop an Image to a given size.
     31 * Crop an image to a given size.
    3232 *
    3333 * @since 2.1.0
    3434 *
     
    8282 *
    8383 * @since 2.1.0
    8484 *
    85  * @param int $attachment_id Attachment Id to process.
     85 * @param int $attachment_id Attachment ID to process.
    8686 * @param string $file Filepath of the Attached image.
    8787 * @return mixed Metadata for attachment.
    8888 */
     
    9797                list($uwidth, $uheight) = wp_constrain_dimensions($metadata['width'], $metadata['height'], 128, 96);
    9898                $metadata['hwstring_small'] = "height='$uheight' width='$uwidth'";
    9999
    100                 // Make the file path relative to the upload dir
     100                // Make the file path relative to the upload directory
    101101                $metadata['file'] = _wp_relative_upload_path($file);
    102102
    103103                // make thumbnails and other intermediate sizes
     
    138138}
    139139
    140140/**
    141  * Calculated the new dimentions for a downsampled image.
     141 * Calculated the new dimensions for a down-sampled image.
    142142 *
    143143 * @since 2.0.0
    144144 * @see wp_constrain_dimensions()
     
    184184/**
    185185 * Get extended image metadata, exif or iptc as available.
    186186 *
    187  * Retrieves the EXIF metadata aperture, credit, camera, caption, copyright, iso
     187 * Retrieves the EXIF metadata aperture, credit, camera, caption, copyright, ISO
    188188 * created_timestamp, focal_length, shutter_speed, and title.
    189189 *
    190190 * The IPTC metadata that is retrieved is APP13, credit, byline, created date
     
    203203
    204204        list( , , $sourceImageType ) = getimagesize( $file );
    205205
    206         // exif contains a bunch of data we'll probably never need formatted in ways
     206        // EXIF contains a bunch of data we'll probably never need formatted in ways
    207207        // that are difficult to use. We'll normalize it and just extract the fields
    208208        // that are likely to be useful.  Fractions and numbers are converted to
    209209        // floats, dates to unix timestamps, and everything else to strings.
     
    220220                'title' => '',
    221221        );
    222222
    223         // read iptc first, since it might contain data not available in exif such
     223        // Read IPTC first, since it might contain data not available in EXIF such
    224224        // as caption, description etc
    225225        if ( is_callable( 'iptcparse' ) ) {
    226226                getimagesize( $file, $info );
     
    228228                if ( ! empty( $info['APP13'] ) ) {
    229229                        $iptc = iptcparse( $info['APP13'] );
    230230
    231                         // headline, "A brief synopsis of the caption."
     231                        // Headline, "A brief synopsis of the caption."
    232232                        if ( ! empty( $iptc['2#105'][0] ) )
    233233                                $meta['title'] = utf8_encode( trim( $iptc['2#105'][0] ) );
    234                         // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways."
     234                        // Title, "Many use the title field to store the filename of the image, though the field may be used in many ways."
    235235                        elseif ( ! empty( $iptc['2#005'][0] ) )
    236236                                $meta['title'] = utf8_encode( trim( $iptc['2#005'][0] ) );
    237237
    238                         if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
     238                        if ( ! empty( $iptc['2#120'][0] ) ) { // Description / legacy caption
    239239                                $caption = utf8_encode( trim( $iptc['2#120'][0] ) );
    240240                                if ( empty( $meta['title'] ) ) {
    241241                                        // Assume the title is stored in 2:120 if it's short.
     
    248248                                }
    249249                        }
    250250
    251                         if ( ! empty( $iptc['2#110'][0] ) ) // credit
     251                        if ( ! empty( $iptc['2#110'][0] ) ) // Credit
    252252                                $meta['credit'] = utf8_encode(trim($iptc['2#110'][0]));
    253                         elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
     253                        elseif ( ! empty( $iptc['2#080'][0] ) ) // Creator / legacy byline
    254254                                $meta['credit'] = utf8_encode(trim($iptc['2#080'][0]));
    255255
    256256                        if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time
    257257                                $meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
    258258
    259                         if ( ! empty( $iptc['2#116'][0] ) ) // copyright
     259                        if ( ! empty( $iptc['2#116'][0] ) ) // Copyright
    260260                                $meta['copyright'] = utf8_encode( trim( $iptc['2#116'][0] ) );
    261261                 }
    262262        }
    263263
    264         // fetch additional info from exif if available
     264        // Fetch additional info from EXIF if available
    265265        if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
    266266                $exif = @exif_read_data( $file );
    267267
     
    332332        $info = @getimagesize($path);
    333333        if ( empty($info) )
    334334                $result = false;
    335         elseif ( !in_array($info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) )     // only gif, jpeg and png images can reliably be displayed
     335        elseif ( !in_array($info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) )     // Only GIF, JPEG and PNG images can reliably be displayed
    336336                $result = false;
    337337        else
    338338                $result = true;
  • wp-admin/includes/class-wp-filesystem-direct.php

     
    2828        /**
    2929         * connect filesystem.
    3030         *
    31          * @return bool Returns true on success or false on failure (always true for WP_Filesystem_Direct).
     31         * @return bool returns true on success or false on failure (always true for WP_Filesystem_Direct).
    3232         */
    3333        function connect() {
    3434                return true;
     
    3737         * Reads entire file into a string
    3838         *
    3939         * @param string $file Name of the file to read.
    40          * @return string|bool The function returns the read data or false on failure.
     40         * @return string|bool the function returns the read data or false on failure.
    4141         */
    4242        function get_contents($file) {
    4343                return @file_get_contents($file);
     
    8989         *
    9090         * @param string $file Path to the file.
    9191         * @param mixed $group A group name or number.
    92          * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.
    93          * @return bool Returns true on success or false on failure.
     92         * @param bool $recursive (optional) If set True changes file group recursively. Defaults to False.
     93         * @return bool returns true on success or false on failure.
    9494         */
    9595        function chgrp($file, $group, $recursive = false) {
    9696                if ( ! $this->exists($file) )
     
    112112         *
    113113         * @param string $file Path to the file.
    114114         * @param int $mode (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
    115          * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.
    116          * @return bool Returns true on success or false on failure.
     115         * @param bool $recursive (optional) If set True changes file group recursively. Defaults to False.
     116         * @return bool returns true on success or false on failure.
    117117         */
    118118        function chmod($file, $mode = false, $recursive = false) {
    119119                if ( ! $mode ) {
     
    140140         *
    141141         * @param string $file Path to the file.
    142142         * @param mixed $owner A user name or number.
    143          * @param bool $recursive (optional) If set True changes file owner recursivly. Defaults to False.
    144          * @return bool Returns true on success or false on failure.
     143         * @param bool $recursive (optional) If set True changes file owner recursively. Defaults to False.
     144         * @return bool returns true on success or false on failure.
    145145         */
    146146        function chown($file, $owner, $recursive = false) {
    147147                if ( ! $this->exists($file) )
     
    160160        /**
    161161         * Gets file owner
    162162         *
    163          * @param string $file Path to the file.
     163         * @param string $file path to the file.
    164164         * @return string Username of the user.
    165165         */
    166166        function owner($file) {
     
    177177         *
    178178         * FIXME does not handle errors in fileperms()
    179179         *
    180          * @param string $file Path to the file.
    181          * @return string Mode of the file (last 4 digits).
     180         * @param string $file path to the file.
     181         * @return string mode of the file (last 4 digits).
    182182         */
    183183        function getchmod($file) {
    184184                return substr(decoct(@fileperms($file)),3);
     
    207207                if ( ! $overwrite && $this->exists($destination) )
    208208                        return false;
    209209
    210                 // try using rename first.  if that fails (for example, source is read only) try copy
     210                // try using rename first, if that fails(for example, source is read only), try copy.
    211211                if ( @rename($source, $destination) )
    212212                        return true;
    213213
     
    222222        function delete($file, $recursive = false, $type = false) {
    223223                if ( empty($file) ) //Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
    224224                        return false;
    225                 $file = str_replace('\\', '/', $file); //for win32, occasional problems deleting files otherwise
     225                $file = str_replace('\\', '/', $file); //For win32, occasional problems deleting files otherwise
    226226
    227227                if ( 'f' == $type || $this->is_file($file) )
    228228                        return @unlink($file);
    229229                if ( ! $recursive && $this->is_dir($file) )
    230230                        return @rmdir($file);
    231231
    232                 //At this point its a folder, and we're in recursive mode
     232                //At this point it's a folder, and we're in recursive mode
    233233                $file = trailingslashit($file);
    234234                $filelist = $this->dirlist($file, true);
    235235
    236236                $retval = true;
    237                 if ( is_array($filelist) ) //false if no files, So check first.
     237                if ( is_array($filelist) ) //False if no files, so check first.
    238238                        foreach ($filelist as $filename => $fileinfo)
    239239                                if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
    240240                                        $retval = false;
     
    284284        }
    285285
    286286        function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
    287                 // safe mode fails with a trailing slash under certain PHP versions.
     287                // Safe mode fails with a trailing slash under certain PHP versions.
    288288                $path = untrailingslashit($path);
    289289                if ( empty($path) )
    290290                        $path = '/';
  • wp-admin/includes/nav-menu.php

     
    6969
    7070                if ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
    7171                        $classes[] = 'pending';
    72                         /* translators: %s: title of menu item in draft status */
     72                        /* Translators: %s: title of menu item in draft status */
    7373                        $title = sprintf( __('%s (Pending)'), $item->title );
    7474                }
    7575
     
    598598        if ( isset( $post_type['args']->_default_query ) )
    599599                $args = array_merge($args, (array) $post_type['args']->_default_query );
    600600
    601         // @todo transient caching of these results with proper invalidation on updating of a post of this type
     601        // TODO: transient caching of these results with proper invalidation on updating of a post of this type
    602602        $get_posts = new WP_Query;
    603603        $posts = $get_posts->query( $args );
    604604        if ( ! $get_posts->post_count ) {
     
    720720                                <?php
    721721                                $args['walker'] = $walker;
    722722
    723                                 // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
     723                                // If we're dealing with pages, let's put a checkbox for the front page at the top of the list
    724724                                if ( 'page' == $post_type_name ) {
    725725                                        $front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
    726726                                        if ( ! empty( $front_page ) ) {
     
    799799        global $nav_menu_selected_id;
    800800        $taxonomy_name = $taxonomy['args']->name;
    801801
    802         // paginate browsing for large numbers of objects
     802        // Paginate browsing for large numbers of objects
    803803        $per_page = 50;
    804804        $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
    805805        $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
     
    10461046                                'post_status' => 'publish',
    10471047                        );
    10481048
    1049                 // posts should show only published items
     1049                // Posts should show only published items
    10501050                } elseif ( 'post' == $object->name ) {
    10511051                        $object->_default_query = array(
    10521052                                'post_status' => 'publish',
    10531053                        );
    10541054
    1055                 // cats should be in reverse chronological order
     1055                // Cats should be in reverse chronological order
    10561056                } elseif ( 'category' == $object->name ) {
    10571057                        $object->_default_query = array(
    10581058                                'orderby' => 'id',
    10591059                                'order' => 'DESC',
    10601060                        );
    10611061
    1062                 // custom post types should show only published items
     1062                // Custom post types should show only published items
    10631063                } else {
    10641064                        $object->_default_query = array(
    10651065                                'post_status' => 'publish',
     
    11481148        global $wpdb;
    11491149        $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
    11501150
    1151         // delete orphaned draft menu items
     1151        // Delete orphaned draft menu items
    11521152        $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
    11531153
    11541154        foreach( (array) $menu_items_to_delete as $menu_item_id )
  • wp-admin/includes/class-wp-filesystem-ssh2.php

     
    2424 *
    2525 * Note: Do not leave the directory yet!
    2626 *
    27  * Enter: pecl install -f ssh2
     27 * Enter: pecl install -f SSH2
    2828 *
    2929 * Copy the ssh.so file it creates to your PHP Module Directory.
    3030 * Open up your PHP.INI file and look for where extensions are placed.
     
    5252                $this->method = 'ssh2';
    5353                $this->errors = new WP_Error();
    5454
    55                 //Check if possible to use ssh2 functions.
     55                //Check if possible to use SSH2 functions.
    5656                if ( ! extension_loaded('ssh2') ) {
    5757                        $this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
    5858                        return false;
     
    9292                        $this->options['username'] = $opt['username'];
    9393
    9494                if ( empty ($opt['password']) ) {
    95                         if ( !$this->keys )     //password can be blank if we are using keys
     95                        if ( !$this->keys )     //Password can be blank if we are using keys
    9696                                $this->errors->add('empty_password', __('SSH2 password is required'));
    9797                } else {
    9898                        $this->options['password'] = $opt['password'];
     
    306306        }
    307307
    308308        function touch($file, $time = 0, $atime = 0) {
    309                 //Not implmented.
     309                //Not implemented.
    310310        }
    311311
    312312        function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
  • wp-admin/includes/class-wp-importer.php

     
    109109                        }
    110110                } while ( count( $results ) == $limit );
    111111
    112                 // unset to save memory
     112                // Unset to save memory
    113113                unset( $results, $r );
    114114
    115115                return $hashtable;
  • wp-admin/update.php

     
    11<?php
    22/**
    3  * Update/Install Plugin/Theme administration panel.
     3 * Update/Install Plugin/Theme Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/install-helper.php

     
    66 * require_once().
    77 *
    88 * These functions are not optimized for speed, but they should only be used
    9  * once in a while, so speed shouldn't be a concern. If it is and you are
     9 * once in a while, so speed shouldn't be a concern. If it is used, and you are
    1010 * needing to use these functions a lot, you might experience time outs. If you
    11  * do, then it is advised to just write the SQL code yourself.
     11 * do experience time outs, then it is advised to just write the SQL code yourself.
    1212 *
    1313 * You can turn debugging on, by setting $debug to 1 after you include this
    1414 * file.
  • wp-admin/theme-editor.php

     
    11<?php
    22/**
    3  * Theme editor administration panel.
     3 * Theme Editor Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    195195                <li><a href="theme-editor.php?file=<?php echo "$template_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>&amp;dir=theme"><?php echo $filedesc ?></a></li>
    196196<?php endwhile; ?>
    197197        </ul>
    198         <h3><?php /* translators: Theme stylesheets in theme editor */ _ex('Styles', 'Theme stylesheets in theme editor'); ?></h3>
     198        <h3><?php /* Translators: Theme stylesheets in theme editor */ _ex('Styles', 'Theme stylesheets in theme editor'); ?></h3>
    199199        <ul>
    200200<?php
    201201        $template_mapping = array();
  • wp-admin/admin.php

     
    117117                $the_parent = $pagenow;
    118118        if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
    119119                $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
    120                 // backwards compatibility for plugins using add_management_page
     120                // Backwards compatibility for plugins using add_management_page
    121121                if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
    122122                        // There could be plugin specific params on the URL, so we need the whole query string
    123123                        if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
  • wp-admin/admin-functions.php

     
    11<?php
    22/**
    33 * Administration Functions
    4  *
    54 * This file is deprecated, use 'wp-admin/includes/admin.php' instead.
    65 *
    76 * @deprecated 2.5
  • wp-admin/revision.php

     
    11<?php
    22/**
    3  * Revisions administration panel.
     3 * Revisions Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    6161                break;
    6262        }
    6363
    64         if ( $left_revision->ID == $right_revision->post_parent ) // right is a revision of left
     64        if ( $left_revision->ID == $right_revision->post_parent ) // Right is a revision of left
    6565                $post =& $left_revision;
    66         elseif ( $left_revision->post_parent == $right_revision->ID ) // left is a revision of right
     66        elseif ( $left_revision->post_parent == $right_revision->ID ) // Left is a revision of right
    6767                $post =& $right_revision;
    68         elseif ( $left_revision->post_parent == $right_revision->post_parent ) // both are revisions of common parent
     68        elseif ( $left_revision->post_parent == $right_revision->post_parent ) // Both are revisions of common parent
    6969                $post = get_post( $left_revision->post_parent );
    7070        else
    7171                break; // Don't diff two unrelated revisions
    7272
    7373        if ( ! WP_POST_REVISIONS || !post_type_supports($post->post_type, 'revisions') ) { // Revisions disabled
    7474                if (
    75                         // we're not looking at an autosave
     75                        // We're not looking at an autosave
    7676                        ( !wp_is_post_autosave( $left_revision ) && !wp_is_post_autosave( $right_revision ) )
    7777                ||
    78                         // we're not comparing an autosave to the current post
     78                        // We're not comparing an autosave to the current post
    7979                        ( $post->ID !== $left_revision->ID && $post->ID !== $right_revision->ID )
    8080                ) {
    8181                        $redirect = 'edit.php?post_type=' . $post->post_type;
     
    139139        exit;
    140140}
    141141
    142 // This is so that the correct "Edit" menu item is selected.
     142// This is so the correct "Edit" menu item is selected.
    143143if ( !empty($post->post_type) && 'post' != $post->post_type )
    144144        $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
    145145else
     
    165165</tr>
    166166<?php endif;
    167167
    168 // use get_post_to_edit filters?
     168// Use get_post_to_edit filters?
    169169$identical = true;
    170170foreach ( _wp_post_revision_fields() as $field => $field_title ) :
    171171        if ( 'diff' == $action ) {
  • wp-admin/ms-sites.php

     
    11<?php
    22/**
    3  * Multisite sites administration panel.
     3 * Multisite Sites Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
  • wp-admin/user-new.php

     
    1818
    1919if ( is_multisite() ) {
    2020        function admin_created_user_email( $text ) {
    21                 /* translators: 1: Site name, 2: site URL, 3: role */
     21                /* Translators: 1: Site name, 2: site URL, 3: role */
    2222                return sprintf( __( 'Hi,
    2323You\'ve been invited to join \'%1$s\' at
    2424%2$s as a %3$s.
  • wp-admin/options-general.php

     
    11<?php
    22/**
    3  * General settings administration panel.
     3 * General Settings Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    1414
    1515$title = __('General Settings');
    1616$parent_file = 'options-general.php';
    17 /* translators: date and time format for exact current time, mainly about timezones, see http://php.net/date */
     17/* Translators: date and time format for exact current time, mainly about timezones, see http://php.net/date */
    1818$timezone_format = _x('Y-m-d G:i:s', 'timezone date format');
    1919
    2020/**
  • wp-admin/options-media.php

     
    11<?php
    22/**
    3  * Media settings administration panel.
     3 * Media Settings Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/my-sites.php

     
    11<?php
    22/**
    3  * My Sites dashboard.
     3 * My Sites Dashboard.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
  • wp-admin/upload.php

     
    11<?php
    22/**
    3  * Media Library administration panel.
     3 * Media Library Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/edit-form-comment.php

     
    5454
    5555<div class="misc-pub-section curtime misc-pub-section-last">
    5656<?php
    57 // translators: Publish box date formt, see http://php.net/date
     57// Translators: Publish box date format, see http://php.net/date
    5858$datef = __( 'M j, Y @ G:i' );
    5959$stamp = __('Submitted on: <b>%1$s</b>');
    6060$date = date_i18n( $datef, strtotime( $comment->comment_date ) );
  • wp-admin/edit-form-advanced.php

     
    3434         2 => __('Custom field updated.'),
    3535         3 => __('Custom field deleted.'),
    3636         4 => __('Post updated.'),
    37         /* translators: %s: date and time of the revision */
     37        /* translators: %s: Date and time of the revision */
    3838         5 => isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
    3939         6 => sprintf( __('Post published. <a href="%s">View post</a>'), esc_url( get_permalink($post_ID) ) ),
    4040         7 => __('Post saved.'),
     
    8484$nonce_action = 'update-' . $post_type . '_' . $post_ID;
    8585$form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
    8686
    87 // Detect if there exists an autosave newer than the post and if that autosave is different than the post
     87// Detect if an autosave newer than the post exists and if that autosave is different than the post
    8888if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
    8989        foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
    9090                if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
  • wp-admin/ms-upgrade-network.php

     
    11<?php
    22/**
    3  * Multisite upgrade administration panel.
     3 * Multisite Upgrade Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
  • wp-admin/plugin-install.php

     
    55 * @package WordPress
    66 * @subpackage Administration
    77 */
    8 // TODO route this pages via a specific iframe handler instead of the do_action below
     8// TODO route this page via a specific iframe handler instead of the do_action below
    99if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
    1010        define( 'IFRAME_REQUEST', true );
    1111
  • wp-admin/freedoms.php

     
    11<?php
    22/**
    3  * Your Rights administration panel.
     3 * Your Rights Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/nav-menus.php

     
    280280                if ( isset( $_POST['menu-locations'] ) )
    281281                        set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
    282282
    283                 // Add Menu
     283                // Add menu
    284284                if ( 0 == $nav_menu_selected_id ) {
    285285                        $new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
    286286
  • wp-admin/options-discussion.php

     
    11<?php
    22/**
    3  * Discussion settings administration panel.
     3 * Discussion Settings Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    161161
    162162<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites.  Here you can enable the display of avatars for people who comment on your site.'); ?></p>
    163163
    164 <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
     164<?php // The above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
    165165
    166166<table class="form-table">
    167167<tr valign="top">
     
    182182
    183183<?php
    184184$ratings = array(
    185         /* translators: Content suitability rating: http://bit.ly/89QxZA */
     185        /* Translators: Content suitability rating: http://bit.ly/89QxZA */
    186186        'G' => __('G &#8212; Suitable for all audiences'),
    187         /* translators: Content suitability rating: http://bit.ly/89QxZA */
     187        /* Translators: Content suitability rating: http://bit.ly/89QxZA */
    188188        'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'),
    189         /* translators: Content suitability rating: http://bit.ly/89QxZA */
     189        /* Translators: Content suitability rating: http://bit.ly/89QxZA */
    190190        'R' => __('R &#8212; Intended for adult audiences above 17'),
    191         /* translators: Content suitability rating: http://bit.ly/89QxZA */
     191        /* Translators: Content suitability rating: http://bit.ly/89QxZA */
    192192        'X' => __('X &#8212; Even more mature than above')
    193193);
    194194foreach ($ratings as $key => $rating) :
  • wp-admin/ms-users.php

     
    11<?php
    22/**
    3  * Multisite users administration panel.
     3 * Multisite Users Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
  • wp-admin/plugins.php

     
    11<?php
    22/**
    3  * Plugins administration panel.
     3 * Plugins Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    198198                                exit;
    199199                        }
    200200
    201                         $plugins = array_filter($plugins, 'is_plugin_inactive'); // Do not allow to delete Activated plugins.
     201                        $plugins = array_filter($plugins, 'is_plugin_inactive'); // Do not allow to delete activated plugins.
    202202                        if ( empty( $plugins ) ) {
    203203                                wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s" ) );
    204204                                exit;
     
    255255                                                $data_to_delete = false;
    256256                                                foreach ( $plugin_info as $plugin ) {
    257257                                                        if ( $plugin['is_uninstallable'] ) {
    258                                                                 /* translators: 1: plugin name, 2: plugin author */
     258                                                                /* Translators: 1: plugin name, 2: plugin author */
    259259                                                                echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)' ), esc_html($plugin['Name']), esc_html($plugin['AuthorName']) ), '</li>';
    260260                                                                $data_to_delete = true;
    261261                                                        } else {
    262                                                                 /* translators: 1: plugin name, 2: plugin author */
     262                                                                /* Translators: 1: plugin name, 2: plugin author */
    263263                                                                echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), esc_html($plugin['Name']), esc_html($plugin['AuthorName']) ), '</li>';
    264264                                                        }
    265265                                                }
  • wp-admin/credits.php

     
    11<?php
    22/**
    3  * Credits administration panel.
     3 * Credits Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/user-edit.php

     
    11<?php
    22/**
    3  * Edit user administration panel.
     3 * Edit User Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    3636else
    3737        $parent_file = 'profile.php';
    3838
    39 // contextual help - choose Help on the top right of admin panel to preview this.
     39// Contextual help - choose Help on the top right of admin panel to preview this.
    4040add_contextual_help($current_screen,
    4141    '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
    4242    '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '</p>' .
     
    115115        if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) )
    116116                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
    117117
    118         // WPMU must delete the user from the current blog if WP added him after editing.
     118        // Multisite must delete the user from the current blog if WordPress added user after editing.
    119119        $delete_role = false;
    120120        $blog_prefix = $wpdb->get_blog_prefix();
    121121        if ( $user_id != $current_user->ID ) {
     
    127127        }
    128128        if ( !isset( $errors ) || ( isset( $errors ) && is_object( $errors ) && false == $errors->get_error_codes() ) )
    129129                $errors = edit_user($user_id);
    130         if ( $delete_role ) // stops users being added to current blog when they are edited
     130        if ( $delete_role ) // Stops users from being added to current blog when they are edited
    131131                delete_user_meta( $user_id, $blog_prefix . 'capabilities' );
    132132
    133133        if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) )
     
    217217<td><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></span></legend>
    218218<label for="admin_bar_front">
    219219<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1" <?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
    220 <?php /* translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
     220<?php /* Translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
    221221<label for="admin_bar_admin">
    222222<input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
    223 <?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label></fieldset>
     223<?php /* Translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label></fieldset>
    224224</td>
    225225</tr>
    226226<?php do_action('personal_options', $profileuser); ?>
     
    247247$user_roles = $profileuser->roles;
    248248$user_role = array_shift($user_roles);
    249249
    250 // print the full list of roles with the primary one selected.
     250// Print the full list of roles with the primary one selected.
    251251wp_dropdown_roles($user_role);
    252252
    253 // print the 'no role' option. Make it selected if the user has no role yet.
     253// Print the 'no role' option. Make it selected if the user has no role yet.
    254254if ( $user_role )
    255255        echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
    256256else
  • wp-admin/options-reading.php

     
    11<?php
    22/**
    3  * Reading settings administration panel.
     3 * Reading Settings Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/ms-themes.php

     
    11<?php
    22/**
    3  * Multisite themes administration panel.
     3 * Multisite Themes Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
  • wp-admin/setup-config.php

     
    2929error_reporting(0);
    3030
    3131/**#@+
    32  * These three defines are required to allow us to use require_wp_db() to load
     32 * These three definitions are required to allow us to use require_wp_db() to load
    3333 * the database class while being wp-content/db.php aware.
    3434 * @ignore
    3535 */
  • wp-admin/ms-admin.php

     
    11<?php
    22/**
    3  * Multisite administration panel.
     3 * Multisite Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Multisite
  • wp-admin/install.php

     
    138138<?php
    139139} // end display_setup_form()
    140140
    141 // Let's check to make sure WP isn't already installed.
     141// Let's check to make sure WordPress isn't already installed.
    142142if ( is_blog_installed() ) {
    143143        display_header();
    144144        die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button">' . __('Log In') . '</a></p></body></html>' );
  • wp-admin/theme-install.php

     
    11<?php
    22/**
    3  * Install theme administration panel.
     3 * Install Theme Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/widgets.php

     
    11<?php
    22/**
    3  * Widgets administration panel.
     3 * Widgets Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    4646$help .= '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
    4747add_contextual_help($current_screen, $help);
    4848
    49 // register the inactive_widgets area as sidebar
     49// Register the inactive_widgets area as sidebar
    5050register_sidebar(array(
    5151        'name' => __('Inactive Widgets'),
    5252        'id' => 'wp_inactive_widgets',
     
    6262if ( empty( $sidebars_widgets ) )
    6363        $sidebars_widgets = wp_get_widget_defaults();
    6464
    65 // look for "lost" widgets, this has to run at least on each theme change
     65// Look for "lost" widgets, this has to run at least on each theme change
    6666function retrieve_widgets() {
    6767        global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
    6868
     
    8686                }
    8787        }
    8888
    89         // if new theme has less sidebars than the old theme
     89        // If new theme has less sidebars than the old theme
    9090        if ( !empty($sidebars_widgets) ) {
    9191                foreach ( $sidebars_widgets as $lost => $val ) {
    9292                        if ( is_array($val) )
     
    9494                }
    9595        }
    9696
    97         // discard invalid, theme-specific widgets from sidebars
     97        // Discard invalid, theme-specific widgets from sidebars
    9898        $shown_widgets = array();
    9999        foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
    100100                if ( !is_array($widgets) )
     
    112112        $sidebars_widgets = $_sidebars_widgets;
    113113        unset($_sidebars_widgets, $_widgets);
    114114
    115         // find hidden/lost multi-widget instances
     115        // Find hidden/lost multi-widget instances
    116116        $lost_widgets = array();
    117117        foreach ( $wp_registered_widgets as $key => $val ) {
    118118                if ( in_array($key, $shown_widgets, true) )
     
    171171        $id_base = $_POST['id_base'];
    172172        $sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
    173173
    174         // delete
     174        // Delete
    175175        if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
    176176
    177177                if ( !in_array($widget_id, $sidebar, true) ) {
     
    198198
    199199        $sidebars_widgets[$sidebar_id] = $sidebar;
    200200
    201         // remove old position
     201        // Remove old position
    202202        if ( !isset($_POST['delete_widget']) ) {
    203203                foreach ( $sidebars_widgets as $key => $sb ) {
    204204                        if ( is_array($sb) )
     
    253253
    254254        $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
    255255
    256         // show the widget form
     256        // Show the widget form
    257257        $width = ' style="width:' . max($control['width'], 350) . 'px"';
    258258        $key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
    259259
  • wp-admin/update-core.php

     
    11<?php
    22/**
    3  * Update Core administration panel.
     3 * Update Core Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    134134        }
    135135
    136136        echo '<p>';
    137         /* translators: %1 date, %2 time. */
     137        /* Translators: %1 date, %2 time. */
    138138        printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) );
    139139        echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php') ) . '">' . __( 'Check Again' ) . '</a>';
    140140        echo '</p>';
     
    304304}
    305305
    306306/**
    307  * Upgrade WordPress core display.
     307 * Upgrade WordPress Core Display.
    308308 *
    309309 * @since 2.7
    310310 *
     
    417417} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
    418418        check_admin_referer('upgrade-core');
    419419
    420         // do the (un)dismiss actions before headers,
     420        // Do the (un)dismiss actions before headers,
    421421        // so that they can redirect
    422422        if ( isset( $_POST['dismiss'] ) )
    423423                do_dismiss_core_update();
  • wp-admin/options-writing.php

     
    11<?php
    22/**
    3  * Writing settings administration panel.
     3 * Writing Settings Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
  • wp-admin/themes.php

     
    11<?php
    22/**
    3  * Themes administration panel.
     3 * Themes Administration Panel.
    44 *
    55 * @package WordPress
    66 * @subpackage Administration
     
    8989<img src="<?php echo $ct->theme_root_uri . '/' . $ct->stylesheet . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" />
    9090<?php endif; ?>
    9191<h4><?php
    92         /* translators: 1: theme title, 2: theme version, 3: theme author */
     92        /* Translators: 1: theme title, 2: theme version, 3: theme author */
    9393        printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4>
    9494<p class="theme-description"><?php echo $ct->description; ?></p>
    9595<div class="theme-options">