Ticket #7918: final-corrections.diff
| File final-corrections.diff, 13.8 KB (added by , 17 years ago) |
|---|
-
wp-admin/includes/plugin-install.php
156 156 echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%d plugin'), 'multiple_text' => __('%d plugins') ) ); 157 157 } 158 158 159 function install_search_form($after_submit = '') { 159 /** 160 * Display search form for searching plugins. 161 * 162 * @since 2.7.0 163 */ 164 function install_search_form(){ 160 165 $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : ''; 161 166 $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; 162 167 -
wp-includes/functions.php
646 646 /** 647 647 * Saves and restores user interface settings stored in a cookie. 648 648 * 649 * Checks if the current user-settings cookie is updated and stores it. When no 650 * cookie exists (different browser used), adds the last saved cookie restoring 651 * the settings. 652 * 649 653 * @package WordPress 650 654 * @subpackage Option 651 655 * @since 2.7.0 652 *653 * Checks if the current user-settings cookie is updated and stores it.654 * When no cookie exists (different browser used), adds the last saved cookie restoring the settings.655 656 */ 656 657 function wp_user_settings() { 657 658 … … 690 691 * 691 692 * @package WordPress 692 693 * @subpackage Option 693 * @since 2.7.0 694 * 694 * @since 2.7.0 695 * 695 696 * @param string $name The name of the setting. 696 697 * @param string $default Optional default value to return when $name is not set. 697 698 * @return mixed the last saved user setting or the default value/false if it doesn't exist. … … 706 707 /** 707 708 * Delete user interface settings. 708 709 * 710 * Deleting settings would reset them to the defaults. 711 * 709 712 * @package WordPress 710 713 * @subpackage Option 711 714 * @since 2.7.0 712 715 * 713 * Deleting settings would reset them to the defaults.714 *715 716 * @param mixed $names The name or array of names of the setting to be deleted. 716 717 */ 717 718 function delete_user_setting( $names ) { … … 763 764 return array(); 764 765 } 765 766 767 /** 768 * Delete the user settings of the current user. 769 * 770 * @package WordPress 771 * @subpackage Option 772 * @since 2.7.0 773 */ 766 774 function delete_all_user_settings() { 767 775 if ( ! $user = wp_get_current_user() ) 768 776 return; -
wp-includes/functions.wp-scripts.php
34 34 return $wp_scripts->do_items( $handles ); 35 35 } 36 36 37 /** 38 * Register new JavaScript file. 39 * 40 * @since r16 41 * @see WP_Scripts::add() For parameter information. 42 */ 37 43 function wp_register_script( $handle, $src, $deps = array(), $ver = false ) { 38 44 global $wp_scripts; 39 45 if ( !is_a($wp_scripts, 'WP_Scripts') ) … … 43 49 } 44 50 45 51 /** 46 * Localizes a script 52 * Localizes a script. 47 53 * 48 * Localizes only if script has already been added 54 * Localizes only if script has already been added. 49 55 * 56 * @since r16 50 57 * @see WP_Script::localize() 51 58 */ 52 59 function wp_localize_script( $handle, $object_name, $l10n ) { … … 57 64 return $wp_scripts->localize( $handle, $object_name, $l10n ); 58 65 } 59 66 67 /** 68 * Remove a registered script. 69 * 70 * @since r16 71 * @see WP_Scripts::remove() For parameter information. 72 */ 60 73 function wp_deregister_script( $handle ) { 61 74 global $wp_scripts; 62 75 if ( !is_a($wp_scripts, 'WP_Scripts') ) … … 66 79 } 67 80 68 81 /** 69 * E queues script82 * Enqueues script. 70 83 * 71 84 * Registers the script if src provided (does NOT overwrite) and enqueues. 72 85 * 86 * @since r16 73 87 * @see WP_Script::add(), WP_Script::enqueue() 74 88 */ 75 89 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false ) { -
wp-includes/functions.wp-styles.php
7 7 */ 8 8 9 9 /** 10 * {@internal Missing Short Description}}10 * Display styles that are in the queue or part of $handles. 11 11 * 12 12 * @since r79 13 * @uses do_action() Calls 'wp_print_styles' hook. 14 * @global object $wp_styles The WP_Styles object for printing styles. 13 15 * 14 * @param mixed $handles See {@link WP_Styles::do_items()} for information.15 * @return mixed See {@link WP_Styles::do_items()} for information.16 * @param array $handles (optional) Styles to be printed. (void) prints queue, (string) prints that style, (array of strings) prints those styles. 17 * @return bool True on success, false on failure. 16 18 */ 17 19 function wp_print_styles( $handles = false ) { 18 20 do_action( 'wp_print_styles' ); … … 30 32 return $wp_styles->do_items( $handles ); 31 33 } 32 34 35 /** 36 * Register CSS style file. 37 * 38 * @since r79 39 * @see WP_Styles::add() For parameter and additional information. 40 */ 33 41 function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = false ) { 34 42 global $wp_styles; 35 43 if ( !is_a($wp_styles, 'WP_Styles') ) … … 38 46 $wp_styles->add( $handle, $src, $deps, $ver, $media ); 39 47 } 40 48 49 /** 50 * Remove a registered CSS file. 51 * 52 * @since r79 53 * @see WP_Styles::remove() For parameter and additional information. 54 */ 41 55 function wp_deregister_style( $handle ) { 42 56 global $wp_styles; 43 57 if ( !is_a($wp_styles, 'WP_Styles') ) … … 46 60 $wp_styles->remove( $handle ); 47 61 } 48 62 63 /** 64 * Enqueue a CSS style file. 65 * 66 * @since r79 67 * @see WP_Styles::add(), WP_Styles::enqueue() 68 */ 49 69 function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = false ) { 50 70 global $wp_styles; 51 71 if ( !is_a($wp_styles, 'WP_Styles') ) -
wp-includes/general-template.php
93 93 load_template( get_theme_root() . '/default/sidebar.php'); 94 94 } 95 95 96 /** 97 * Display search form. 98 * 99 * Will first attempt to locate the searchform.php file in either the child or 100 * the parent, then load it. If it doesn't exist, then the default search form 101 * will be displayed. 102 * 103 * @since 2.7.0 104 */ 96 105 function get_search_form() { 97 106 do_action( 'get_search_form' ); 98 107 -
wp-includes/link-template.php
28 28 * @since 2.2.0 29 29 * @uses $wp_rewrite 30 30 * 31 * @param $string string a URL with or without a trailing slash32 * @param $type_of_url string the type of URL being considered (e.g. single, category, etc) for use in the filter31 * @param $string String a URL with or without a trailing slash 32 * @param $type_of_url String the type of URL being considered (e.g. single, category, etc) for use in the filter 33 33 * @return string 34 34 */ 35 35 function user_trailingslashit($string, $type_of_url = '') { … … 439 439 * @subpackage Feed 440 440 * @since 2.5.0 441 441 * 442 * @param string $link_text Descriptive text 442 * @param string $link_text Descriptive text. 443 443 * @param int $post_id Optional post ID. Default to current post. 444 * @param string $feed Optional. {@internal Missing Description}}445 * @return string Link to the comment feed for the current post 444 * @param string $feed Optional. Feed format. 445 * @return string Link to the comment feed for the current post. 446 446 */ 447 447 function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) { 448 448 $url = get_post_comments_feed_link($post_id, $feed); -
wp-includes/pluggable.php
426 426 } 427 427 endif; 428 428 429 if ( !function_exists('wp_authenticate') ) : 429 430 /** 430 431 * Checks a user's login information and logs them in if it checks out. 431 432 * 432 * @since 2.5 433 * @since 2.5.0 433 434 * 434 435 * @param string $username User's username 435 436 * @param string $password User's password 436 437 * @return WP_Error|WP_User WP_User object if login successful, otherwise WP_Error object. 437 438 */ 438 if ( !function_exists('wp_authenticate') ) :439 439 function wp_authenticate($username, $password) { 440 440 $username = sanitize_user($username); 441 441 … … 467 467 } 468 468 endif; 469 469 470 if ( !function_exists('wp_logout') ) : 470 471 /** 471 472 * Log the current user out. 472 473 * 473 * @since 2.5 474 * @since 2.5.0 474 475 */ 475 if ( !function_exists('wp_logout') ) :476 476 function wp_logout() { 477 477 wp_clear_auth_cookie(); 478 478 do_action('wp_logout'); -
wp-includes/rss.php
17 17 */ 18 18 do_action('load_feed_engine'); 19 19 20 20 /** RSS feed constant. */ 21 21 define('RSS', 'RSS'); 22 22 define('ATOM', 'Atom'); 23 23 define('MAGPIE_USER_AGENT', 'WordPress/' . $GLOBALS['wp_version']); -
wp-includes/script-loader.php
298 298 * 299 299 * @param object $styles 300 300 */ 301 302 301 function wp_default_styles( &$styles ) { 303 302 // This checks to see if site_url() returns something and if it does not 304 303 // then it assigns $guess_url to wp_guess_url(). Strange format, but it works. … … 346 345 * @param array $js_array JavaScript scripst array 347 346 * @return array Reordered array, if needed. 348 347 */ 349 350 348 function wp_prototype_before_jquery( $js_array ) { 351 349 if ( false === $jquery = array_search( 'jquery', $js_array ) ) 352 350 return $js_array; -
wp-settings.php
17 17 18 18 19 19 /** 20 * wp_unregister_GLOBALS() - Turn register globals off20 * Turn register globals off. 21 21 * 22 22 * @access private 23 23 * @since 2.1.0 … … 142 142 die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ ); 143 143 144 144 /** 145 * timer_start() - PHP 4 standard microtime start capture145 * PHP 4 standard microtime start capture. 146 146 * 147 147 * @access private 148 148 * @since 0.71 149 * @global int $timestart Seconds and Microseconds added together from when function is called 150 * @return bool Always returns true 149 * @global int $timestart Seconds and Microseconds added together from when function is called. 150 * @return bool Always returns true. 151 151 */ 152 152 function timer_start() { 153 153 global $timestart; … … 158 158 } 159 159 160 160 /** 161 * timer_stop() -Return and/or display the time from the page start to when function is called.161 * Return and/or display the time from the page start to when function is called. 162 162 * 163 163 * You can get the results and print them by doing: 164 164 * <code> … … 315 315 /** 316 316 * Allows for the plugins directory to be moved from the default location. 317 317 * 318 * @since 2.6 318 * @since 2.6.0 319 319 */ 320 320 if ( !defined('WP_PLUGIN_DIR') ) 321 321 define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash 322 323 /** 324 * Allows for the plugins directory to be moved from the default location. 325 * 326 * @since 2.6.0 327 */ 322 328 if ( !defined('WP_PLUGIN_URL') ) 323 329 define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash 330 331 /** 332 * Allows for the plugins directory to be moved from the default location. 333 * 334 * @since 2.1.0 335 */ 324 336 if ( !defined('PLUGINDIR') ) 325 337 define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. 326 338 … … 336 348 337 349 /** 338 350 * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php 339 * @since 2.5 351 * @since 2.5.0 340 352 */ 341 353 $wp_default_secret_key = 'put your unique phrase here'; 342 354 … … 356 368 357 369 /** 358 370 * It is possible to define this in wp-config.php 359 * @since 2.5 371 * @since 2.5.0 360 372 */ 361 373 if ( !defined('AUTH_COOKIE') ) 362 374 define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH); 363 375 364 376 /** 365 377 * It is possible to define this in wp-config.php 366 * @since 2.6 378 * @since 2.6.0 367 379 */ 368 380 if ( !defined('SECURE_AUTH_COOKIE') ) 369 381 define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH); 370 382 371 383 /** 372 384 * It is possible to define this in wp-config.php 373 * @since 2.6 385 * @since 2.6.0 374 386 */ 375 387 if ( !defined('LOGGED_IN_COOKIE') ) 376 388 define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH); … … 398 410 399 411 /** 400 412 * It is possible to define this in wp-config.php 401 * @since 2.6 413 * @since 2.6.0 402 414 */ 403 415 if ( !defined('ADMIN_COOKIE_PATH') ) 404 416 define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); 405 417 406 418 /** 407 419 * It is possible to define this in wp-config.php 408 * @since 2.6 420 * @since 2.6.0 409 421 */ 410 422 if ( !defined('PLUGINS_COOKIE_PATH') ) 411 423 define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL) ); … … 419 431 420 432 /** 421 433 * It is possible to define this in wp-config.php 422 * @since 2.6 434 * @since 2.6.0 423 435 */ 424 436 if ( !defined('FORCE_SSL_ADMIN') ) 425 437 define('FORCE_SSL_ADMIN', false); … … 427 439 428 440 /** 429 441 * It is possible to define this in wp-config.php 430 * @since 2.6 442 * @since 2.6.0 431 443 */ 432 444 if ( !defined('FORCE_SSL_LOGIN') ) 433 445 define('FORCE_SSL_LOGIN', false); … … 529 541 530 542 /** 531 543 * Web Path to the current active template directory 532 * @since 1.5 544 * @since 1.5.0 533 545 */ 534 546 define('TEMPLATEPATH', get_template_directory()); 535 547 536 548 /** 537 549 * Web Path to the current active template stylesheet directory 538 * @since 2.1 550 * @since 2.1.0 539 551 */ 540 552 define('STYLESHEETPATH', get_stylesheet_directory()); 541 553 … … 568 580 include(TEMPLATEPATH . '/functions.php'); 569 581 570 582 /** 571 * shutdown_action_hook() -Runs just before PHP shuts down execution.583 * Runs just before PHP shuts down execution. 572 584 * 573 585 * @access private 574 * @since 1.2 586 * @since 1.2.0 575 587 */ 576 588 function shutdown_action_hook() { 577 589 do_action('shutdown');