Changeset 18639
- Timestamp:
- 09/05/2011 07:08:15 PM (14 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 16 edited
-
js/tinymce/plugins/wpdialogs/js/popup.dev.js (modified) (2 diffs)
-
l10n.php (modified) (1 diff)
-
link-template.php (modified) (1 diff)
-
locale.php (modified) (1 diff)
-
media.php (modified) (4 diffs)
-
pluggable.php (modified) (2 diffs)
-
plugin.php (modified) (3 diffs)
-
post.php (modified) (6 diffs)
-
query.php (modified) (2 diffs)
-
script-loader.php (modified) (2 diffs)
-
shortcodes.php (modified) (1 diff)
-
taxonomy.php (modified) (9 diffs)
-
theme.php (modified) (1 diff)
-
user.php (modified) (1 diff)
-
widgets.php (modified) (3 diffs)
-
wp-db.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js
r17340 r18639 68 68 * 69 69 * @method getWindowArg 70 * @param {String} n Name of the window argument to retri ve.70 * @param {String} n Name of the window argument to retrieve. 71 71 * @param {String} dv Optional default value to return. 72 72 * @return {String} Argument value or default value if it wasn't found. … … 82 82 * 83 83 * @method getParam 84 * @param {String} n Name of the editor config option to retri ve.84 * @param {String} n Name of the editor config option to retrieve. 85 85 * @param {String} dv Optional default value to return. 86 86 * @return {String} Parameter value or default value if it wasn't found. -
trunk/wp-includes/l10n.php
r17925 r18639 399 399 * @param string $abs_rel_path Optional. Relative path to ABSPATH of a folder, 400 400 * where the .mo file resides. Deprecated, but still functional until 2.7 401 * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes prece ndence over $abs_rel_path401 * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precedence over $abs_rel_path 402 402 */ 403 403 function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) { -
trunk/wp-includes/link-template.php
r18478 r18639 2416 2416 2417 2417 /** 2418 * Inject rel=s ortlink into head if a shortlink is defined for the current page.2418 * Inject rel=shortlink into head if a shortlink is defined for the current page. 2419 2419 * 2420 2420 * Attached to the wp_head action. -
trunk/wp-includes/locale.php
r18280 r18639 66 66 * Stores the translated strings for 'am' and 'pm'. 67 67 * 68 * Also the cap alized versions.68 * Also the capitalized versions. 69 69 * 70 70 * @since 2.1.0 -
trunk/wp-includes/media.php
r18605 r18639 261 261 262 262 /** 263 * Calculates the new dimen tions for a downsampled image.263 * Calculates the new dimensions for a downsampled image. 264 264 * 265 265 * If either width or height are empty, no constraint is applied on … … 306 306 307 307 // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short 308 // We also have issues with recursive calls resulting in an ever-changing result. Con training to the result of a constraint should yield the original result.308 // We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result. 309 309 // Thus we look for dimensions that are one pixel shy of the max value and bump them up 310 310 if ( $did_width && $w == $max_width - 1 ) … … 1145 1145 * 1146 1146 * @param array $attr Shortcode attributes. 1147 * @param string $url The URL attempting to be embed ed.1147 * @param string $url The URL attempting to be embedded. 1148 1148 * @return string The embed HTML on success, otherwise the original URL. 1149 1149 */ … … 1373 1373 * @uses WP_oEmbed::get_html() 1374 1374 * 1375 * @param string $url The URL that should be embed ed.1375 * @param string $url The URL that should be embedded. 1376 1376 * @param array $args Addtional arguments and parameters. 1377 1377 * @return string The original URL on failure or the embed HTML on success. -
trunk/wp-includes/pluggable.php
r18597 r18639 1087 1087 $post = get_post($comment->comment_post_ID); 1088 1088 $user = get_userdata( $post->post_author ); 1089 // Send to the administ ation and to the post author if the author can modify the comment.1089 // Send to the administration and to the post author if the author can modify the comment. 1090 1090 $email_to = array( get_option('admin_email') ); 1091 1091 if ( user_can($user->ID, 'edit_comment', $comment_id) && !empty($user->user_email) && ( get_option('admin_email') != $user->user_email) ) … … 1433 1433 * Maintains compatibility between old version and the new cookie authentication 1434 1434 * protocol using PHPass library. The $hash parameter is the encrypted password 1435 * and the function compares the plain text password when enc ypted similarly1435 * and the function compares the plain text password when encrypted similarly 1436 1436 * against the already encrypted password to see if they match. 1437 1437 * -
trunk/wp-includes/plugin.php
r18507 r18639 252 252 * @param callback $function_to_remove The name of the function which should be removed. 253 253 * @param int $priority optional. The priority of the function (default: 10). 254 * @param int $accepted_args optional. The number of arguments the function acc pets (default: 1).254 * @param int $accepted_args optional. The number of arguments the function accepts (default: 1). 255 255 * @return boolean Whether the function existed before it was removed. 256 256 */ … … 521 521 * @param callback $function_to_remove The name of the function which should be removed. 522 522 * @param int $priority optional The priority of the function (default: 10). 523 * @param int $accepted_args optional. The number of arguments the function acc pets (default: 1).523 * @param int $accepted_args optional. The number of arguments the function accepts (default: 1). 524 524 * @return boolean Whether the function is removed. 525 525 */ … … 746 746 * @param callback $function Used for creating unique id 747 747 * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise. 748 * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a uniq e id.748 * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id. 749 749 */ 750 750 function _wp_filter_build_unique_id($tag, $function, $priority) { -
trunk/wp-includes/post.php
r18627 r18639 1156 1156 * 1157 1157 * Accepted keys of the label array in the post type object: 1158 * - name - general name for the post type, usually plural. The same and overrid en by $post_type_object->label. Default is Posts/Pages1158 * - name - general name for the post type, usually plural. The same and overridden by $post_type_object->label. Default is Posts/Pages 1159 1159 * - singular_name - name for one object of this post type. Default is Post/Page 1160 1160 * - add_new - Default is Add New for both hierarchical and non-hierarchical types. When internationalizing this string, please use a {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context gettext context} matching your post type. Example: <code>_x('Add New', 'product');</code> … … 1250 1250 * 1251 1251 * Additionally, the 'revisions' feature dictates whether the post type will store revisions, 1252 * and the 'comments' feature dic ates whether the comments count will show on the edit screen.1252 * and the 'comments' feature dictates whether the comments count will show on the edit screen. 1253 1253 * 1254 1254 * @since 3.0.0 … … 3270 3270 /** 3271 3271 * function to traverse and return all the nested children post names of a root page. 3272 * $children contains parent-chil ren relations3272 * $children contains parent-children relations 3273 3273 * 3274 3274 * @since 2.9.0 … … 3912 3912 } 3913 3913 3914 if ( empty($url) ) //If any of the above options failed, Fallback on the GUID as used pre-2.7, not recom ended to rely upon this.3914 if ( empty($url) ) //If any of the above options failed, Fallback on the GUID as used pre-2.7, not recommended to rely upon this. 3915 3915 $url = get_the_guid( $post->ID ); 3916 3916 … … 4467 4467 * Will clean the attachment in the cache. 4468 4468 * 4469 * Cleaning means delete from the cache. Optional y will clean the term4469 * Cleaning means delete from the cache. Optionally will clean the term 4470 4470 * object cache associated with the attachment ID. 4471 4471 * … … 4665 4665 * 4666 4666 * Does two things. If passed a post *array*, it will return a post array ready 4667 * to be ins terted into the posts table as a post revision. Otherwise, returns4667 * to be inserted into the posts table as a post revision. Otherwise, returns 4668 4668 * an array whose keys are the post fields to be saved for post revisions. 4669 4669 * -
trunk/wp-includes/query.php
r18330 r18639 2138 2138 $q['p'] = absint($q['comments_popup']); 2139 2139 2140 // If an attachment is requested by number, let it super cede any post number.2140 // If an attachment is requested by number, let it supersede any post number. 2141 2141 if ( $q['attachment_id'] ) 2142 2142 $q['p'] = absint($q['attachment_id']); … … 2289 2289 $q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash 2290 2290 } else { 2291 $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trail ling slash2291 $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash 2292 2292 } 2293 2293 } -
trunk/wp-includes/script-loader.php
r18634 r18639 160 160 $max_upload_size = __('not configured'); 161 161 162 // error messag oe for both plupload and swfupload162 // error message for both plupload and swfupload 163 163 $uploader_l10n = array( 164 164 'queue_limit_exceeded' => __('You have attempted to queue too many files.'), … … 440 440 * @since 2.3.1 441 441 * 442 * @param array $js_array JavaScript scrip starray442 * @param array $js_array JavaScript scripts array 443 443 * @return array Reordered array, if needed. 444 444 */ -
trunk/wp-includes/shortcodes.php
r12750 r18639 158 158 * in a regex class. 159 159 * 160 * The regular expres ion contains 6 different sub matches to help with parsing.160 * The regular expression contains 6 different sub matches to help with parsing. 161 161 * 162 162 * 1/6 - An extra [ or ] to allow for escaping shortcodes with double [[]] -
trunk/wp-includes/taxonomy.php
r18603 r18639 267 267 * (?$query_var=$term); default will use $taxonomy as query var. 268 268 * 269 * public - If the taxonomy should be public ally queryable; //@TODO not implemented.269 * public - If the taxonomy should be publicly queryable; //@TODO not implemented. 270 270 * defaults to true. 271 271 * … … 277 277 * 278 278 * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget; 279 * defaults to show_ui which defa lts to public.279 * defaults to show_ui which defaults to public. 280 280 * 281 281 * labels - An array of labels for this taxonomy. You can see accepted values in {@link get_taxonomy_labels()}. By default tag labels are used for non-hierarchical types and category labels for hierarchical ones. … … 370 370 * 371 371 * Accepted keys of the label array in the taxonomy object: 372 * - name - general name for the taxonomy, usually plural. The same as and overrid en by $tax->label. Default is Post Tags/Categories372 * - name - general name for the taxonomy, usually plural. The same as and overridden by $tax->label. Default is Post Tags/Categories 373 373 * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category 374 374 * - search_items - Default is Search Tags/Search Categories … … 1497 1497 * Sanitize Term all fields. 1498 1498 * 1499 * Rel ys on sanitize_term_field() to sanitize the term. The difference is that1499 * Relies on sanitize_term_field() to sanitize the term. The difference is that 1500 1500 * this function will sanitize <strong>all</strong> fields. The context is based 1501 1501 * on sanitize_term_field(). … … 1786 1786 * 1787 1787 * @param int $cat_ID 1788 * @return mixed Returns true if completes delete action; false if term doesn t exist;1788 * @return mixed Returns true if completes delete action; false if term doesn't exist; 1789 1789 * Zero on attempted deletion of default Category; WP_Error object is also a possibility. 1790 1790 */ … … 1811 1811 * 1812 1812 * The fields argument also decides what will be returned. If 'all' or 1813 * 'all_with_object_id' is cho osen or the default kept intact, then all matching1813 * 'all_with_object_id' is chosen or the default kept intact, then all matching 1814 1814 * terms objects will be returned. If either 'ids' or 'names' is used, then an 1815 1815 * array of all matching term ids or term names will be returned respectively. … … 1919 1919 * Adds a new term to the database. Optionally marks it as an alias of an existing term. 1920 1920 * 1921 * Error handling is assigned for the nonexist ance of the $taxonomy and $term1921 * Error handling is assigned for the nonexistence of the $taxonomy and $term 1922 1922 * parameters before inserting. If both the term id and taxonomy exist 1923 1923 * previously, then an array will be returned that contains the term id and the … … 2180 2180 * 2181 2181 * If that still doesn't return an unique slug, then it try to append a number 2182 * until it finds a number that is tru ely unique.2182 * until it finds a number that is truly unique. 2183 2183 * 2184 2184 * The only purpose for $term is for appending a parent, if one exists. … … 2386 2386 * Updates the amount of terms in taxonomy. 2387 2387 * 2388 * If there is a taxonomy callback appl yed, then it will be called for updating2388 * If there is a taxonomy callback applied, then it will be called for updating 2389 2389 * the count. 2390 2390 * -
trunk/wp-includes/theme.php
r18630 r18639 470 470 * @since 2.9.0 471 471 * 472 * @return array|string An arr y of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root.472 * @return array|string An array of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root. 473 473 */ 474 474 function get_theme_roots() { -
trunk/wp-includes/user.php
r18597 r18639 1444 1444 * A simpler way of inserting an user into the database. 1445 1445 * 1446 * Creates a new user with just the username, password, and email. For amore1447 * detail creation of a user, use wp_insert_user() to specify more infomation.1446 * Creates a new user with just the username, password, and email. For more 1447 * complex user creation use wp_insert_user() to specify more information. 1448 1448 * 1449 1449 * @since 2.0.0 -
trunk/wp-includes/widgets.php
r18630 r18639 140 140 141 141 if ( $empty ) { 142 // If there are none, we register the widget's exist ance with a142 // If there are none, we register the widget's existence with a 143 143 // generic template 144 144 $this->_set(1); … … 298 298 299 299 if ( !array_key_exists('_multiwidget', $settings) ) { 300 // old format, conver if single widget300 // old format, convert if single widget 301 301 $settings = wp_convert_widget_settings($this->id_base, $this->option_name, $settings); 302 302 } … … 462 462 * number the sidebar is currently when greater than one. If first sidebar, the 463 463 * name will be just "Sidebar". The default for id is "sidebar-" followed by the 464 * number the sidebar creation is currently at. If the id is provided, and mu tliple464 * number the sidebar creation is currently at. If the id is provided, and multiple 465 465 * sidebars are being defined, the id will have "-2" appended, and so on. 466 466 * -
trunk/wp-includes/wp-db.php
r18573 r18639 641 641 * 642 642 * Also allows for the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE to 643 * override the WordPress users and user smeta tables that would otherwise643 * override the WordPress users and usermeta tables that would otherwise 644 644 * be determined by the prefix. 645 645 * … … 1290 1290 * a numerically indexed array (0 => value, ...) or an object ( ->column = value ), respectively. 1291 1291 * @param int $y Optional. Row to return. Indexed from 0. 1292 * @return mixed Database query result in format specif ed by $output or null on failure1292 * @return mixed Database query result in format specified by $output or null on failure 1293 1293 */ 1294 1294 function get_row( $query = null, $output = OBJECT, $y = 0 ) {
Note: See TracChangeset
for help on using the changeset viewer.