WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / includes / deprecated.php

diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php
index 8ae6048edc0a0caba15c9aa03da0b5d52eb94353..e12547e90b6d61acb655240b15cade889317e618 100644 (file)
--- a/wp-admin/includes/deprecated.php
+++ b/wp-admin/includes/deprecated.php
@@ -33,7 +33,6 @@ function tinymce_include() {
  */
 function documentation_link() {
        _deprecated_function( __FUNCTION__, '2.5' );
  */
 function documentation_link() {
        _deprecated_function( __FUNCTION__, '2.5' );

-       return;

 }
 
 /**
 }
 
 /**


@@ -204,7 +203,6 @@ function remove_option_update_handler( $option_group, $option_name, $sanitize_ca
 **/
 function codepress_get_lang( $filename ) {
        _deprecated_function( __FUNCTION__, '3.0' );
 **/
 function codepress_get_lang( $filename ) {
        _deprecated_function( __FUNCTION__, '3.0' );

-       return;

 }
 
 /**
 }
 
 /**


@@ -215,7 +213,6 @@ function codepress_get_lang( $filename ) {
 **/
 function codepress_footer_js() {
        _deprecated_function( __FUNCTION__, '3.0' );
 **/
 function codepress_footer_js() {
        _deprecated_function( __FUNCTION__, '3.0' );

-       return;

 }
 
 /**
 }
 
 /**


@@ -226,7 +223,6 @@ function codepress_footer_js() {
 **/
 function use_codepress() {
        _deprecated_function( __FUNCTION__, '3.0' );
 **/
 function use_codepress() {
        _deprecated_function( __FUNCTION__, '3.0' );

-       return;

 }
 
 /**
 }
 
 /**


@@ -474,7 +470,7 @@ class WP_User_Search {
        var $paging_text;
 
        /**
        var $paging_text;
 
        /**

-        * PHP4 Constructor - Sets up the object properties.
+        * PHP5 Constructor - Sets up the object properties.

         *
         * @since 2.1.0
         *
         *
         * @since 2.1.0
         *


@@ -483,7 +479,7 @@ class WP_User_Search {
         * @param string $role Role name.
         * @return WP_User_Search
         */
         * @param string $role Role name.
         * @return WP_User_Search
         */

-       function WP_User_Search ($search_term = '', $page = '', $role = '') {
+       function __construct( $search_term = '', $page = '', $role = '' ) {

                _deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' );
 
                $this->search_term = wp_unslash( $search_term );
                _deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' );
 
                $this->search_term = wp_unslash( $search_term );


@@ -496,6 +492,20 @@ class WP_User_Search {
                $this->do_paging();
        }
 
                $this->do_paging();
        }
 

+       /**
+        * PHP4 Constructor - Sets up the object properties.
+        *
+        * @since 2.1.0
+        *
+        * @param string $search_term Search terms string.
+        * @param int $page Optional. Page ID.
+        * @param string $role Role name.
+        * @return WP_User_Search
+        */
+       public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
+               self::__construct( $search_term, $page, $role );
+       }
+

        /**
         * {@internal Missing Short Description}}
         *
        /**
         * {@internal Missing Short Description}}
         *


@@ -552,7 +562,7 @@ class WP_User_Search {
                if ( $this->results )
                        $this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
                else
                if ( $this->results )
                        $this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
                else

-                       $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
+                       $this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));

        }
 
        /**
        }
 
        /**


@@ -576,9 +586,9 @@ class WP_User_Search {
        function do_paging() {
                if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
                        $args = array();
        function do_paging() {
                if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
                        $args = array();

-                       if( ! empty($this->search_term) )
+                       if ( ! empty($this->search_term) )

                                $args['usersearch'] = urlencode($this->search_term);
                                $args['usersearch'] = urlencode($this->search_term);

-                       if( ! empty($this->role) )
+                       if ( ! empty($this->role) )

                                $args['role'] = urlencode($this->role);
 
                        $this->paging_text = paginate_links( array(
                                $args['role'] = urlencode($this->role);
 
                        $this->paging_text = paginate_links( array(


@@ -736,6 +746,8 @@ function wp_dashboard_quick_press_output() {
  * @deprecated 3.3.0
  * @deprecated Use wp_editor()
  * @see wp_editor()
  * @deprecated 3.3.0
  * @deprecated Use wp_editor()
  * @see wp_editor()

+ *
+ * @staticvar int $num

  */
 function wp_tiny_mce( $teeny = false, $settings = false ) {
        _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
  */
 function wp_tiny_mce( $teeny = false, $settings = false ) {
        _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );