Skip to content

Commit

Permalink
First there were two, and now there are three -- in the @SInCE versio…
Browse files Browse the repository at this point in the history
…ns that came before and that shall be. And so it will be, says nacin.

Props JustinSainton, SergeyBiryukov, DrewAPicture.
Fixes #26713.

Built from https://develop.svn.wordpress.org/trunk@26868


git-svn-id: http://core.svn.wordpress.org/trunk@26754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
DrewAPicture committed Dec 24, 2013
1 parent 1f5f0fc commit cd8cedc
Show file tree
Hide file tree
Showing 39 changed files with 289 additions and 251 deletions.
4 changes: 2 additions & 2 deletions wp-activate.php
Expand Up @@ -27,7 +27,7 @@
/**
* Fires before the Site Activation page is loaded.
*
* @since 3.0
* @since 3.0.0
*/
do_action( 'activate_header' );

Expand All @@ -40,7 +40,7 @@ function do_activate_header() {
/**
* Fires before the Site Activation page is loaded, but on the wp_head action.
*
* @since 3.0
* @since 3.0.0
*/
do_action( 'activate_wp_head' );
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/admin-functions.php
Expand Up @@ -4,7 +4,7 @@
*
* This file is deprecated, use 'wp-admin/includes/admin.php' instead.
*
* @deprecated 2.5
* @deprecated 2.5.0
* @package WordPress
* @subpackage Administration
*/
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/custom-header.php
Expand Up @@ -177,7 +177,7 @@ function js_includes() {
/**
* Set up the enqueue for the CSS files
*
* @since 2.7
* @since 2.7.0
*/
function css_includes() {
$step = $this->step();
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/ajax-actions.php
Expand Up @@ -259,7 +259,7 @@ function wp_ajax_logged_in() {
*
* Contrary to normal success AJAX response ("1"), die with time() on success.
*
* @since 2.7
* @since 2.7.0
*
* @param int $comment_id
* @return die
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/includes/class-ftp-pure.php
Expand Up @@ -3,7 +3,7 @@
* PemFTP - A Ftp implementation in pure PHP
*
* @package PemFTP
* @since 2.5
* @since 2.5.0
*
* @version 1.0
* @copyright Alexey Dotsenko
Expand All @@ -17,7 +17,7 @@
*
* @package PemFTP
* @subpackage Pure
* @since 2.5
* @since 2.5.0
*
* @version 1.0
* @copyright Alexey Dotsenko
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/includes/class-ftp-sockets.php
Expand Up @@ -3,7 +3,7 @@
* PemFTP - A Ftp implementation in pure PHP
*
* @package PemFTP
* @since 2.5
* @since 2.5.0
*
* @version 1.0
* @copyright Alexey Dotsenko
Expand All @@ -17,7 +17,7 @@
*
* @package PemFTP
* @subpackage Socket
* @since 2.5
* @since 2.5.0
*
* @version 1.0
* @copyright Alexey Dotsenko
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/includes/class-wp-theme-install-list-table.php
Expand Up @@ -358,7 +358,7 @@ function install_theme_info( $theme ) {
/**
* Send required variables to JavaScript land
*
* @since 3.4
* @since 3.4.0
* @access private
*
* @uses $tab Global; current tab within Themes->Install screen
Expand All @@ -372,7 +372,7 @@ function _js_vars( $extra_args = array() ) {
/**
* Check to see if the theme is already installed.
*
* @since 3.4
* @since 3.4.0
* @access private
*
* @param object $theme - A WordPress.org Theme API object.
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/file.php
Expand Up @@ -191,7 +191,7 @@ function validate_file_to_edit( $file, $allowed_files = '' ) {
* Handle PHP uploads in WordPress, sanitizing file names, checking extensions for mime type,
* and moving the file to the appropriate directory within the uploads directory.
*
* @since 2.0
* @since 2.0.0
*
* @uses wp_handle_upload_error
* @uses apply_filters
Expand Down
8 changes: 4 additions & 4 deletions wp-admin/includes/misc.php
Expand Up @@ -346,7 +346,7 @@ function wp_doc_link_parse( $content ) {
/**
* Saves option for number of rows when listing posts, pages, comments, etc.
*
* @since 2.8
* @since 2.8.0
**/
function set_screen_options() {

Expand Down Expand Up @@ -648,7 +648,7 @@ function _ipad_meta() {
/**
* Check lock status for posts displayed on the Posts screen
*
* @since 3.6
* @since 3.6.0
*/
function wp_check_locked_posts( $response, $data, $screen_id ) {
$checked = array();
Expand Down Expand Up @@ -679,7 +679,7 @@ function wp_check_locked_posts( $response, $data, $screen_id ) {
/**
* Check lock status on the New/Edit Post screen and refresh the lock
*
* @since 3.6
* @since 3.6.0
*/
function wp_refresh_post_lock( $response, $data, $screen_id ) {
if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
Expand Down Expand Up @@ -718,7 +718,7 @@ function wp_refresh_post_lock( $response, $data, $screen_id ) {
/**
* Check nonce expiration on the New/Edit Post screen and refresh if needed
*
* @since 3.6
* @since 3.6.0
*/
function wp_refresh_post_nonces( $response, $data, $screen_id ) {
if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/plugin.php
Expand Up @@ -1412,7 +1412,7 @@ function remove_submenu_page( $menu_slug, $submenu_slug ) {
*
* If the slug hasn't been registered properly no url will be returned
*
* @since 3.0
* @since 3.0.0
*
* @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
* @param bool $echo Whether or not to echo the url - default is true
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/template.php
Expand Up @@ -1949,7 +1949,7 @@ function convert_to_screen( $hook_name ) {
/**
* Output the HTML for restoring the post data from DOM storage
*
* @since 3.6
* @since 3.6.0
* @access private
*/
function _local_storage_notice() {
Expand Down
6 changes: 3 additions & 3 deletions wp-admin/includes/user.php
Expand Up @@ -9,7 +9,7 @@
/**
* Creates a new user from the "Users" form using $_POST information.
*
* @since 2.0
* @since 2.0.0
*
* @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters.
*/
Expand All @@ -22,7 +22,7 @@ function add_user() {
*
* Used on user-edit.php and profile.php to manage and process user options, passwords etc.
*
* @since 2.0
* @since 2.0.0
*
* @param int $user_id Optional. User ID.
* @return int user id of the updated user
Expand Down Expand Up @@ -193,7 +193,7 @@ function edit_user( $user_id = 0 ) {
* only editors or authors. This filter allows admins to delegate
* user management.
*
* @since 2.8
* @since 2.8.0
*
* @return unknown
*/
Expand Down
10 changes: 5 additions & 5 deletions wp-admin/js/theme-install.js
Expand Up @@ -129,7 +129,7 @@ jQuery( document ).ready( function() {
/**
* Class that provides infinite scroll for Themes admin screens
*
* @since 3.4
* @since 3.4.0
*
* @uses ajaxurl
* @uses list_args
Expand All @@ -147,7 +147,7 @@ var ThemeScroller;
/**
* Initializer
*
* @since 3.4
* @since 3.4.0
* @access private
*/
init: function() {
Expand Down Expand Up @@ -187,7 +187,7 @@ var ThemeScroller;
* Checks to see if user has scrolled to bottom of page.
* If so, requests another page of content from self.ajax().
*
* @since 3.4
* @since 3.4.0
* @access private
*/
poll: function() {
Expand All @@ -204,7 +204,7 @@ var ThemeScroller;
/**
* Applies results passed from this.ajax() to $outList
*
* @since 3.4
* @since 3.4.0
* @access private
*
* @param results Array with results from this.ajax() query.
Expand All @@ -227,7 +227,7 @@ var ThemeScroller;
/**
* Queries next page of themes
*
* @since 3.4
* @since 3.4.0
* @access private
*/
ajax: function() {
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/update-core.php
Expand Up @@ -133,7 +133,7 @@ function dismissed_updates() {
/**
* Display upgrade WordPress for downloading latest or upgrading automatically form.
*
* @since 2.7
* @since 2.7.0
*
* @return null
*/
Expand Down Expand Up @@ -353,7 +353,7 @@ function list_translation_updates() {
/**
* Upgrade WordPress core display.
*
* @since 2.7
* @since 2.7.0
*
* @return null
*/
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/upgrade-functions.php
Expand Up @@ -3,7 +3,7 @@
* WordPress Upgrade Functions. Old file, must not be used. Include
* wp-admin/includes/upgrade.php instead.
*
* @deprecated 2.5
* @deprecated 2.5.0
* @package WordPress
* @subpackage Administration
*/
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/atomlib.php
Expand Up @@ -7,7 +7,7 @@
*
* @author Elias Torres <elias@torrez.us>
* @version 0.4
* @since 2.3
* @since 2.3.0
*/

/**
Expand Down
16 changes: 11 additions & 5 deletions wp-includes/author-template.php
Expand Up @@ -13,7 +13,8 @@
/**
* Retrieve the author of the current post.
*
* @since 1.5
* @since 1.5.0
*
* @uses $authordata The current author's DB object.
* @uses apply_filters() Calls 'the_author' hook on the author display name.
*
Expand Down Expand Up @@ -68,7 +69,8 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
/**
* Retrieve the author who last edited the current post.
*
* @since 2.8
* @since 2.8.0
*
* @uses $post The current post's DB object.
* @uses get_post_meta() Retrieves the ID of the author who last edited the current post.
* @uses get_userdata() Retrieves the author's DB object.
Expand All @@ -93,7 +95,8 @@ function get_the_modified_author() {
/**
* Display the name of the author who last edited the current post.
*
* @since 2.8
* @since 2.8.0
*
* @see get_the_author()
* @return string The author's display name, from get_the_modified_author().
*/
Expand Down Expand Up @@ -184,7 +187,9 @@ function get_the_author_link() {
* author's name.
*
* @link http://codex.wordpress.org/Template_Tags/the_author_link
* @since 2.1
*
* @since 2.1.0
*
* @uses get_the_author_link()
*/
function the_author_link() {
Expand All @@ -194,7 +199,8 @@ function the_author_link() {
/**
* Retrieve the number of posts by the author of the current post.
*
* @since 1.5
* @since 1.5.0
*
* @uses $post The current post in the Loop's DB object.
* @uses count_user_posts()
* @return int The number of posts by the author.
Expand Down
5 changes: 3 additions & 2 deletions wp-includes/cache.php
Expand Up @@ -163,7 +163,8 @@ function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) {
/**
* Saves the data to the cache.
*
* @since 2.0
* @since 2.0.0
*
* @uses $wp_object_cache Object Cache Class
* @see WP_Object_Cache::set()
*
Expand Down Expand Up @@ -256,7 +257,7 @@ function wp_cache_reset() {
*
* @package WordPress
* @subpackage Cache
* @since 2.0
* @since 2.0.0
*/
class WP_Object_Cache {

Expand Down
2 changes: 1 addition & 1 deletion wp-includes/canonical.php
Expand Up @@ -467,7 +467,7 @@ function lowercase_octets($matches) {
* Removes arguments from a query string if they are not present in a URL
* DO NOT use this in plugin code.
*
* @since 3.4
* @since 3.4.0
* @access private
*
* @return string The altered query string
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/category-template.php
Expand Up @@ -1042,7 +1042,7 @@ function the_tags( $before = null, $sep = ', ', $after = '' ) {
/**
* Retrieve tag description.
*
* @since 2.8
* @since 2.8.0
*
* @param int $tag Optional. Tag ID. Will use global tag ID by default.
* @return string Tag description, available.
Expand All @@ -1054,7 +1054,7 @@ function tag_description( $tag = 0 ) {
/**
* Retrieve term description.
*
* @since 2.8
* @since 2.8.0
*
* @param int $term Optional. Term ID. Will use global term ID by default.
* @param string $taxonomy Optional taxonomy name. Defaults to 'post_tag'.
Expand Down

0 comments on commit cd8cedc

Please sign in to comment.