Make WordPress Core

Changeset 34021


Ignore:
Timestamp:
09/10/2015 09:32:46 PM (9 years ago)
Author:
wonderboymusic
Message:

Move 2 ad hoc user admin functions:

  • Move use_ssl_preference() from wp-admin/user-edit.php to wp-admin/includes/user.php.
  • Move admin_created_user_email() from wp-admin/user-new.php to wp-admin/includes/user.php.

See #33813.

Location:
trunk/src/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/user.php

    r34000 r34021  
    466466<?php
    467467}
     468
     469/**
     470 * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
     471 *
     472 * @since 2.7.0
     473 *
     474 * @param object $user User data object
     475 */
     476function use_ssl_preference($user) {
     477?>
     478    <tr class="user-use-ssl-wrap">
     479        <th scope="row"><?php _e('Use https')?></th>
     480        <td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td>
     481    </tr>
     482<?php
     483}
     484
     485/**
     486 *
     487 * @param string $text
     488 * @return string
     489 */
     490function admin_created_user_email( $text ) {
     491    $roles = get_editable_roles();
     492    $role = $roles[ $_REQUEST['role'] ];
     493    /* translators: 1: Site name, 2: site URL, 3: role */
     494    return sprintf( __( 'Hi,
     495You\'ve been invited to join \'%1$s\' at
     496%2$s with the role of %3$s.
     497If you do not want to join this site please ignore
     498this email. This invitation will expire in a few days.
     499
     500Please click the following link to activate your user account:
     501%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
     502}
  • trunk/src/wp-admin/user-edit.php

    r33909 r34021  
    5959
    6060$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
    61 
    62 /**
    63  * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
    64  *
    65  * @since 2.7.0
    66  *
    67  * @param object $user User data object
    68  */
    69 function use_ssl_preference($user) {
    70 ?>
    71     <tr class="user-use-ssl-wrap">
    72         <th scope="row"><?php _e('Use https')?></th>
    73         <td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td>
    74     </tr>
    75 <?php
    76 }
    7761
    7862/**
  • trunk/src/wp-admin/user-new.php

    r33988 r34021  
    2727
    2828if ( is_multisite() ) {
    29     /**
    30      *
    31      * @param string $text
    32      * @return string
    33      */
    34     function admin_created_user_email( $text ) {
    35         $roles = get_editable_roles();
    36         $role = $roles[ $_REQUEST['role'] ];
    37         /* translators: 1: Site name, 2: site URL, 3: role */
    38         return sprintf( __( 'Hi,
    39 You\'ve been invited to join \'%1$s\' at
    40 %2$s with the role of %3$s.
    41 If you do not want to join this site please ignore
    42 this email. This invitation will expire in a few days.
    43 
    44 Please click the following link to activate your user account:
    45 %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
    46     }
    4729    add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
    4830}
Note: See TracChangeset for help on using the changeset viewer.