Ticket #16768: 16768.alot.patch
| File 16768.alot.patch, 23.4 KB (added by , 15 years ago) |
|---|
-
wp-app.php
216 216 var $do_output = true; 217 217 218 218 /** 219 * PHP4 constructor - Sets up object properties.219 * Constructor - Sets up object properties. 220 220 * 221 221 * @since 2.2.0 222 222 * @return AtomServer 223 223 */ 224 function AtomServer() {224 function __construct() { 225 225 226 226 $this->script_name = array_pop( $var_by_ref = explode( '/', $_SERVER['SCRIPT_NAME'] ) ); 227 227 $this->app_base = site_url( $this->script_name . '/' ); -
wp-includes/locale.php
314 314 } 315 315 316 316 /** 317 * PHP4 style constructor which calls helper methods to set up object variables317 * Constructor which calls helper methods to set up object variables 318 318 * 319 319 * @uses WP_Locale::init() 320 320 * @uses WP_Locale::register_globals() … … 322 322 * 323 323 * @return WP_Locale 324 324 */ 325 function WP_Locale() {325 function __construct() { 326 326 $this->init(); 327 327 $this->register_globals(); 328 328 } -
wp-includes/class-feed.php
5 5 6 6 class WP_Feed_Cache extends SimplePie_Cache { 7 7 /** 8 * Don't call the constructor. Please.9 *10 * @access private11 */12 function WP_Feed_Cache() {13 trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);14 }15 16 /**17 8 * Create a new SimplePie_Cache object 18 9 * 19 10 * @static … … 29 20 var $mod_name; 30 21 var $lifetime = 43200; //Default lifetime in cache of 12 hours 31 22 32 function WP_Feed_Cache_Transient($location, $filename, $extension) {23 function __construct($location, $filename, $extension) { 33 24 $this->name = 'feed_' . $filename; 34 25 $this->mod_name = 'feed_mod_' . $filename; 35 26 $this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $this->lifetime, $filename); … … 65 56 66 57 class WP_SimplePie_File extends SimplePie_File { 67 58 68 function WP_SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {59 function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) { 69 60 $this->url = $url; 70 61 $this->timeout = $timeout; 71 62 $this->redirects = $redirects; -
wp-includes/class-http.php
1409 1409 var $domain; 1410 1410 1411 1411 /** 1412 * PHP4 style Constructor - Calls PHP5 Style Constructor.1413 *1414 * @access public1415 * @since 2.8.01416 * @param string|array $data Raw cookie data.1417 */1418 function WP_Http_Cookie( $data ) {1419 $this->__construct( $data );1420 }1421 1422 /**1423 1412 * Sets up this cookie object. 1424 1413 * 1425 1414 * The parameter $data should be either an associative array containing the indices names below -
wp-includes/wp-diff.php
60 60 var $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline'; 61 61 62 62 /** 63 * PHP4Constructor - Call parent constructor with params array.63 * Constructor - Call parent constructor with params array. 64 64 * 65 65 * This will set class properties based on the key value pairs in the array. 66 66 * … … 68 68 * 69 69 * @param array $params 70 70 */ 71 function Text_Diff_Renderer_Table( $params = array() ) {71 function __construct( $params = array() ) { 72 72 $parent = get_parent_class($this); 73 73 $this->$parent( $params ); 74 74 } -
wp-includes/user.php
361 361 var $query_orderby; 362 362 var $query_limit; 363 363 364 /**365 * PHP4 constructor366 */367 function WP_User_Query( $query = null ) {368 $this->__construct( $query );369 }370 364 371 365 /** 372 366 * PHP5 constructor -
wp-includes/class.wp-dependencies.php
221 221 222 222 var $extra = array(); 223 223 224 function _ WP_Dependency() {224 function __construct() { 225 225 @list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args(); 226 226 if ( !is_array($this->deps) ) 227 227 $this->deps = array(); -
wp-includes/class-wp-xmlrpc-server.php
24 24 /** 25 25 * Register all of the XMLRPC methods that XMLRPC server understands. 26 26 * 27 * PHP4 constructor and sets up server and method property. Passes XMLRPC27 * Sets up server and method property. Passes XMLRPC 28 28 * methods through the 'xmlrpc_methods' filter to allow plugins to extend 29 29 * or replace XMLRPC methods. 30 30 * … … 32 32 * 33 33 * @return wp_xmlrpc_server 34 34 */ 35 function wp_xmlrpc_server() {35 function __construct() { 36 36 $this->methods = array( 37 37 // WordPress API 38 38 'wp.getUsersBlogs' => 'this:wp_getUsersBlogs', -
wp-includes/query.php
2970 2970 } 2971 2971 2972 2972 /** 2973 * PHP4 type constructor.2973 * Constructor. 2974 2974 * 2975 2975 * Sets up the WordPress query, if parameter is not empty. 2976 2976 * … … 2980 2980 * @param string $query URL query string. 2981 2981 * @return WP_Query 2982 2982 */ 2983 function WP_Query($query = '') {2983 function __construct($query = '') { 2984 2984 if ( ! empty($query) ) { 2985 2985 $this->query($query); 2986 2986 } -
wp-includes/class-wp-ajax-response.php
16 16 var $responses = array(); 17 17 18 18 /** 19 * PHP4Constructor - Passes args to {@link WP_Ajax_Response::add()}.19 * Constructor - Passes args to {@link WP_Ajax_Response::add()}. 20 20 * 21 21 * @since 2.1.0 22 22 * @see WP_Ajax_Response::add() … … 24 24 * @param string|array $args Optional. Will be passed to add() method. 25 25 * @return WP_Ajax_Response 26 26 */ 27 function WP_Ajax_Response( $args = '' ) {27 function __construct( $args = '' ) { 28 28 if ( !empty($args) ) 29 29 $this->add($args); 30 30 } -
wp-includes/rewrite.php
1976 1976 } 1977 1977 1978 1978 /** 1979 * PHP4Constructor - Calls init(), which runs setup.1979 * Constructor - Calls init(), which runs setup. 1980 1980 * 1981 1981 * @since 1.5.0 1982 1982 * @access public 1983 1983 * 1984 1984 * @return WP_Rewrite 1985 1985 */ 1986 function WP_Rewrite() {1986 function __construct() { 1987 1987 $this->init(); 1988 1988 } 1989 1989 } -
wp-includes/capabilities.php
456 456 var $filter = null; 457 457 458 458 /** 459 * PHP4Constructor - Sets up the object properties.459 * Constructor - Sets up the object properties. 460 460 * 461 461 * Retrieves the userdata and then assigns all of the data keys to direct 462 462 * properties of the object. Calls {@link WP_User::_init_caps()} after … … 470 470 * @param int $blog_id Optional Blog ID, defaults to current blog. 471 471 * @return WP_User 472 472 */ 473 function WP_User( $id, $name = '', $blog_id = '' ) {473 function __construct( $id, $name = '', $blog_id = '' ) { 474 474 475 475 if ( empty( $id ) && empty( $name ) ) 476 476 return; -
wp-includes/class-wp.php
504 504 do_action_ref_array('wp', array(&$this)); 505 505 } 506 506 507 /**508 * PHP4 Constructor - Does nothing.509 *510 * Call main() method when ready to run setup.511 *512 * @since 2.0.0513 *514 * @return WP515 */516 function WP() {517 // Empty.518 }519 507 } 520 508 521 509 /** -
wp-includes/class-wp-error.php
38 38 var $error_data = array(); 39 39 40 40 /** 41 * PHP4Constructor - Sets up error message.41 * Constructor - Sets up error message. 42 42 * 43 43 * If code parameter is empty then nothing will be done. It is possible to 44 44 * add multiple messages to the same code, but with other methods in the … … 54 54 * @param mixed $data Optional. Error data. 55 55 * @return WP_Error 56 56 */ 57 function WP_Error($code = '', $message = '', $data = '') {57 function __construct($code = '', $message = '', $data = '') { 58 58 if ( empty($code) ) 59 59 return; 60 60 -
wp-includes/class-wp-http-ixr-client.php
7 7 * 8 8 */ 9 9 class WP_HTTP_IXR_Client extends IXR_Client { 10 function WP_HTTP_IXR_Client($server, $path = false, $port = 80, $timeout = 15) { 10 11 function __construct($server, $path = false, $port = 80, $timeout = 15) { 11 12 if ( ! $path ) { 12 13 // Assume we have been given a URL instead 13 14 $bits = parse_url($server); -
wp-admin/includes/class-wp-ms-sites-list-table.php
9 9 */ 10 10 class WP_MS_Sites_List_Table extends WP_List_Table { 11 11 12 function WP_MS_Sites_List_Table() {13 parent:: WP_List_Table( array(12 function __construct() { 13 parent::__construct( array( 14 14 'plural' => 'sites', 15 15 ) ); 16 16 } -
wp-admin/includes/class-wp-posts-list-table.php
45 45 */ 46 46 var $sticky_posts_count = 0; 47 47 48 function WP_Posts_List_Table() {48 function __construct() { 49 49 global $post_type_object, $post_type, $wpdb; 50 50 51 51 if ( !isset( $_REQUEST['post_type'] ) ) … … 74 74 $this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status != 'trash' AND ID IN ($sticky_posts)", $post_type ) ); 75 75 } 76 76 77 parent:: WP_List_Table( array(77 parent::__construct( array( 78 78 'plural' => 'posts', 79 79 ) ); 80 80 } -
wp-admin/includes/class-wp-media-list-table.php
9 9 */ 10 10 class WP_Media_List_Table extends WP_List_Table { 11 11 12 function WP_Media_List_Table() {12 function __construct() { 13 13 $this->detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] ); 14 14 15 parent:: WP_List_Table( array(15 parent::__construct( array( 16 16 'plural' => 'media' 17 17 ) ); 18 18 } -
wp-admin/includes/class-wp-links-list-table.php
9 9 */ 10 10 class WP_Links_List_Table extends WP_List_Table { 11 11 12 function WP_Links_List_Table() {13 parent:: WP_List_Table( array(12 function __construct() { 13 parent::__construct( array( 14 14 'plural' => 'bookmarks', 15 15 ) ); 16 16 } -
wp-admin/includes/class-wp-terms-list-table.php
11 11 12 12 var $callback_args; 13 13 14 function WP_Terms_List_Table() {14 function __construct() { 15 15 global $post_type, $taxonomy, $tax; 16 16 17 17 wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) ); … … 27 27 if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'public' => true ) ) ) ) 28 28 $post_type = 'post'; 29 29 30 parent:: WP_List_Table( array(30 parent::__construct( array( 31 31 'plural' => 'tags', 32 32 'singular' => 'tag', 33 33 ) ); -
wp-admin/includes/class-wp-users-list-table.php
12 12 var $site_id; 13 13 var $is_site_users; 14 14 15 function WP_Users_List_Table() {15 function __construct() { 16 16 $screen = get_current_screen(); 17 17 $this->is_site_users = 'site-users-network' == $screen->id; 18 18 19 19 if ( $this->is_site_users ) 20 20 $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; 21 21 22 parent:: WP_List_Table( array(22 parent::__construct( array( 23 23 'singular' => 'user', 24 24 'plural' => 'users' 25 25 ) ); -
wp-admin/includes/class-wp-list-table.php
77 77 * @param array $args An associative array with information about the current table 78 78 * @access protected 79 79 */ 80 function WP_List_Table( $args = array() ) {80 function __construct( $args = array() ) { 81 81 $args = wp_parse_args( $args, array( 82 82 'plural' => '', 83 83 'singular' => '', -
wp-admin/includes/class-wp-ms-themes-list-table.php
12 12 var $site_id; 13 13 var $is_site_themes; 14 14 15 function WP_MS_Themes_List_Table() {15 function __construct() { 16 16 global $status, $page; 17 17 18 18 $default_status = get_user_option( 'themes_last_view' ); … … 32 32 if ( $this->is_site_themes ) 33 33 $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; 34 34 35 parent:: WP_List_Table( array(35 parent::__construct( array( 36 36 'plural' => 'themes' 37 37 ) ); 38 38 } -
wp-admin/includes/class-wp-filesystem-ftpsockets.php
19 19 var $errors = null; 20 20 var $options = array(); 21 21 22 function WP_Filesystem_ftpsockets($opt = '') {22 function __construct($opt = '') { 23 23 $this->method = 'ftpsockets'; 24 24 $this->errors = new WP_Error(); 25 25 -
wp-admin/includes/class-wp-upgrader.php
25 25 var $skin = null; 26 26 var $result = array(); 27 27 28 function WP_Upgrader($skin = null) {29 return $this->__construct($skin);30 }31 28 function __construct($skin = null) { 32 29 if ( null == $skin ) 33 30 $this->skin = new WP_Upgrader_Skin(); … … 925 922 var $done_header = false; 926 923 var $result = false; 927 924 928 function WP_Upgrader_Skin($args = array()) {929 return $this->__construct($args);930 }931 925 function __construct($args = array()) { 932 926 $defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false ); 933 927 $this->options = wp_parse_args($args, $defaults); … … 1014 1008 var $plugin_active = false; 1015 1009 var $plugin_network_active = false; 1016 1010 1017 function Plugin_Upgrader_Skin($args = array()) {1018 return $this->__construct($args);1019 }1020 1021 1011 function __construct($args = array()) { 1022 1012 $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') ); 1023 1013 $args = wp_parse_args($args, $defaults); … … 1070 1060 var $in_loop = false; 1071 1061 var $error = false; 1072 1062 1073 function Bulk_Upgrader_Skin($args = array()) {1074 return $this->__construct($args);1075 }1076 1077 1063 function __construct($args = array()) { 1078 1064 $defaults = array( 'url' => '', 'nonce' => '' ); 1079 1065 $args = wp_parse_args($args, $defaults); … … 1178 1164 1179 1165 class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin { 1180 1166 var $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in. 1181 function Plugin_Upgrader_Skin($args = array()) { 1167 1168 function __construct($args = array()) { 1182 1169 parent::__construct($args); 1183 1170 } 1184 1171 … … 1209 1196 1210 1197 class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin { 1211 1198 var $theme_info = array(); // Theme_Upgrader::bulk() will fill this in. 1212 function Theme_Upgrader_Skin($args = array()) { 1199 1200 function __construct($args = array()) { 1213 1201 parent::__construct($args); 1214 1202 } 1215 1203 … … 1251 1239 var $api; 1252 1240 var $type; 1253 1241 1254 function Plugin_Installer_Skin($args = array()) {1255 return $this->__construct($args);1256 }1257 1258 1242 function __construct($args = array()) { 1259 1243 $defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' ); 1260 1244 $args = wp_parse_args($args, $defaults); … … 1319 1303 var $api; 1320 1304 var $type; 1321 1305 1322 function Theme_Installer_Skin($args = array()) {1323 return $this->__construct($args);1324 }1325 1326 1306 function __construct($args = array()) { 1327 1307 $defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' ); 1328 1308 $args = wp_parse_args($args, $defaults); … … 1385 1365 class Theme_Upgrader_Skin extends WP_Upgrader_Skin { 1386 1366 var $theme = ''; 1387 1367 1388 function Theme_Upgrader_Skin($args = array()) {1389 return $this->__construct($args);1390 }1391 1392 1368 function __construct($args = array()) { 1393 1369 $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') ); 1394 1370 $args = wp_parse_args($args, $defaults); … … 1440 1416 var $package; 1441 1417 var $filename; 1442 1418 1443 function File_Upload_Upgrader($form, $urlholder) {1444 return $this->__construct($form, $urlholder);1445 }1446 1419 function __construct($form, $urlholder) { 1447 1420 if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) 1448 1421 wp_die($uploads['error']); -
wp-admin/includes/class-wp-plugins-list-table.php
9 9 */ 10 10 class WP_Plugins_List_Table extends WP_List_Table { 11 11 12 function WP_Plugins_List_Table() {12 function __construct() { 13 13 global $status, $page; 14 14 15 15 $default_status = get_user_option( 'plugins_last_view' ); … … 23 23 24 24 $page = $this->get_pagenum(); 25 25 26 parent:: WP_List_Table( array(26 parent::__construct( array( 27 27 'plural' => 'plugins', 28 28 ) ); 29 29 } -
wp-admin/includes/class-wp-comments-list-table.php
21 21 22 22 var $pending_count = array(); 23 23 24 function WP_Comments_List_Table() {24 function __construct() { 25 25 global $post_id; 26 26 27 27 $post_id = isset( $_REQUEST['p'] ) ? absint( $_REQUEST['p'] ) : 0; … … 29 29 if ( get_option('show_avatars') ) 30 30 add_filter( 'comment_author', 'floated_admin_avatar' ); 31 31 32 parent:: WP_List_Table( array(32 parent::__construct( array( 33 33 'plural' => 'comments', 34 34 'singular' => 'comment', 35 35 'ajax' => true, -
wp-admin/includes/class-wp-filesystem-direct.php
21 21 * 22 22 * @param mixed $arg ingored argument 23 23 */ 24 function WP_Filesystem_Direct($arg) {24 function __construct($arg) { 25 25 $this->method = 'direct'; 26 26 $this->errors = new WP_Error(); 27 27 } -
wp-admin/includes/class-wp-filesystem-ftpext.php
19 19 var $errors = null; 20 20 var $options = array(); 21 21 22 function WP_Filesystem_FTPext($opt='') {22 function __construct($opt='') { 23 23 $this->method = 'ftpext'; 24 24 $this->errors = new WP_Error(); 25 25 -
wp-admin/includes/class-wp-filesystem-ssh2.php
48 48 var $errors = array(); 49 49 var $options = array(); 50 50 51 function WP_Filesystem_SSH2($opt='') {51 function __construct($opt='') { 52 52 $this->method = 'ssh2'; 53 53 $this->errors = new WP_Error(); 54 54 -
wp-admin/includes/class-wp-importer.php
10 10 */ 11 11 function __construct() {} 12 12 13 function WP_Importer() {14 $this->__construct();15 }16 17 13 /** 18 14 * Returns array with imported permalinks from WordPress database 19 15 * -
wp-admin/custom-header.php
62 62 var $page = ''; 63 63 64 64 /** 65 * PHP4Constructor - Register administration header callback.65 * Constructor - Register administration header callback. 66 66 * 67 67 * @since 2.1.0 68 68 * @param callback $admin_header_callback 69 69 * @param callback $admin_image_div_callback Optional custom image div output callback. 70 70 * @return Custom_Image_Header 71 71 */ 72 function Custom_Image_Header($admin_header_callback, $admin_image_div_callback = '') {72 function __construct($admin_header_callback, $admin_image_div_callback = '') { 73 73 $this->admin_header_callback = $admin_header_callback; 74 74 $this->admin_image_div_callback = $admin_image_div_callback; 75 75 } -
wp-admin/custom-background.php
43 43 var $page = ''; 44 44 45 45 /** 46 * PHP4Constructor - Register administration header callback.46 * Constructor - Register administration header callback. 47 47 * 48 48 * @since 3.0.0 49 49 * @param callback $admin_header_callback 50 50 * @param callback $admin_image_div_callback Optional custom image div output callback. 51 51 * @return Custom_Background 52 52 */ 53 function Custom_Background($admin_header_callback = '', $admin_image_div_callback = '') {53 function __construct($admin_header_callback = '', $admin_image_div_callback = '') { 54 54 $this->admin_header_callback = $admin_header_callback; 55 55 $this->admin_image_div_callback = $admin_image_div_callback; 56 56 }