Changeset 29479
- Timestamp:
- 08/13/2014 03:55:10 AM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/class-wp-upgrader.php
r29206 r29479 2090 2090 } 2091 2091 2092 // Update the lock, as by this point we've defin ately got a lock, just need to fire the actions2092 // Update the lock, as by this point we've definitely got a lock, just need to fire the actions 2093 2093 update_option( $lock_name, time() ); 2094 2094 -
trunk/src/wp-admin/includes/theme.php
r29170 r29479 283 283 * filters. Assume this is for themes, which can extend on the Theme Info to 284 284 * offer more choices. This is very powerful and must be used with care, when 285 * overrid ding the filters.285 * overriding the filters. 286 286 * 287 287 * The first filter, 'themes_api_args', is for the args and gives the action as -
trunk/src/wp-includes/class-IXR.php
r29404 r29479 359 359 } 360 360 } else { 361 // Just add as a param ater361 // Just add as a parameter 362 362 $this->params[] = $value; 363 363 } … … 452 452 // Perform the callback and send the response 453 453 if (count($args) == 1) { 454 // If only one param ater just send that instead of the whole array454 // If only one parameter just send that instead of the whole array 455 455 $args = $args[0]; 456 456 } -
trunk/src/wp-includes/class-http.php
r29230 r29479 728 728 * 729 729 * @param string $url The URL which was requested. 730 * @param array $args The Argu ements which were used to make the request.730 * @param array $args The Arguments which were used to make the request. 731 731 * @param array $response The Response of the HTTP request. 732 732 * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise. … … 1431 1431 $curl_error = curl_errno( $handle ); 1432 1432 1433 // If an error occur ed, or, no response.1433 // If an error occurred, or, no response. 1434 1434 if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) { 1435 1435 if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error && $r['stream'] ) { -
trunk/src/wp-includes/class-simplepie.php
r28479 r29479 1613 1613 1614 1614 /** 1615 * Get the error message for the occur ed error1615 * Get the error message for the occurred error. 1616 1616 * 1617 1617 * @return string|array Error message, or array of messages for multifeeds -
trunk/src/wp-includes/class-wp-walker.php
r29454 r29479 41 41 42 42 /** 43 * W ether the current element has children or not.43 * Whether the current element has children or not. 44 44 * 45 45 * To be used in start_el(). -
trunk/src/wp-includes/date.php
r28935 r29479 85 85 * } 86 86 * @type string $column Optional. Used to add a clause comparing a column other than the column 87 * specified in the top-level $column param ater. Default is the value87 * specified in the top-level $column parameter. Default is the value 88 88 * of top-level $column. Accepts 'post_date', 'post_date_gmt', 89 89 * 'post_modified', 'post_modified_gmt', 'comment_date', 'comment_date_gmt'. -
trunk/src/wp-includes/formatting.php
r29431 r29479 228 228 229 229 foreach ( $textarr as &$curl ) { 230 // Only call _wptexturize_pushpop_element if $curl is a delim eter.230 // Only call _wptexturize_pushpop_element if $curl is a delimiter. 231 231 $first = $curl[0]; 232 232 if ( '<' === $first && '>' === substr( $curl, -1 ) ) { 233 // This is an HTML delim eter.233 // This is an HTML delimiter. 234 234 235 235 if ( '<!--' !== substr( $curl, 0, 4 ) ) { … … 238 238 239 239 } elseif ( '' === trim( $curl ) ) { 240 // This is a newline between delim eters. Performance improves when we check this.240 // This is a newline between delimiters. Performance improves when we check this. 241 241 242 242 continue; 243 243 244 244 } elseif ( '[' === $first && 1 === preg_match( '/^\[(?:[^\[\]<>]|<[^>]+>)++\]$/', $curl ) ) { 245 // This is a shortcode delim eter.245 // This is a shortcode delimiter. 246 246 247 247 _wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes ); 248 248 249 249 } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?(?:[^\[\]<>]|<[^>]+>)++\]\]?$/', $curl ) ) { 250 // This is an escaped shortcode delim eter.250 // This is an escaped shortcode delimiter. 251 251 252 252 // Do not texturize. … … 256 256 257 257 } elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) { 258 // This is neither a delim eter, nor is this content inside of no_texturize pairs. Do texturize.258 // This is neither a delimiter, nor is this content inside of no_texturize pairs. Do texturize. 259 259 260 260 $curl = str_replace( $static_characters, $static_replacements, $curl ); -
trunk/src/wp-includes/js/heartbeat.js
r27981 r29479 64 64 connecting: false, 65 65 66 // Whether a connection error occur ed66 // Whether a connection error occurred 67 67 connectionError: false, 68 68 -
trunk/src/wp-includes/js/media-audiovideo.js
r29456 r29479 618 618 * wp.media.view.MediaDetails 619 619 * 620 * @con tructor620 * @constructor 621 621 * @augments wp.media.view.Settings.AttachmentDisplay 622 622 * @augments wp.media.view.Settings … … 763 763 * wp.media.view.AudioDetails 764 764 * 765 * @con tructor765 * @constructor 766 766 * @augments wp.media.view.MediaDetails 767 767 * @augments wp.media.view.Settings.AttachmentDisplay … … 795 795 * wp.media.view.VideoDetails 796 796 * 797 * @con tructor797 * @constructor 798 798 * @augments wp.media.view.MediaDetails 799 799 * @augments wp.media.view.Settings.AttachmentDisplay -
trunk/src/wp-includes/js/media-views.js
r29473 r29479 6785 6785 * wp.media.view.EmbedImage 6786 6786 * 6787 * @con tructor6787 * @constructor 6788 6788 * @augments wp.media.view.Settings.AttachmentDisplay 6789 6789 * @augments wp.media.view.Settings … … 6812 6812 * wp.media.view.ImageDetails 6813 6813 * 6814 * @con tructor6814 * @constructor 6815 6815 * @augments wp.media.view.Settings.AttachmentDisplay 6816 6816 * @augments wp.media.view.Settings -
trunk/src/wp-includes/js/swfupload/swfupload.js
r18484 r29479 4 4 * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/ 5 5 * 6 * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz én and Mammon Media and is released under the MIT License:6 * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License: 7 7 * http://www.opensource.org/licenses/mit-license.php 8 8 * -
trunk/src/wp-includes/js/thickbox/thickbox.js
r29346 r29479 106 106 imgPreloader.onload = null; 107 107 108 // Resizing large images - or ginal by Christian Montoya edited by me.108 // Resizing large images - original by Christian Montoya edited by me. 109 109 var pagesize = tb_getPageSize(); 110 110 var x = pagesize[0] - 150; … … 187 187 var params = tb_parseQuery( queryString ); 188 188 189 TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no param aters were added to URL190 TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no param aters were added to URL189 TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no parameters were added to URL 190 TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no parameters were added to URL 191 191 ajaxContentW = TB_WIDTH - 30; 192 192 ajaxContentH = TB_HEIGHT - 45; -
trunk/src/wp-includes/pomo/translations.php
r23357 r29479 173 173 174 174 /** 175 * Adds par antheses to the inner parts of ternary operators in175 * Adds parentheses to the inner parts of ternary operators in 176 176 * plural expressions, because PHP evaluates ternary oerators from left to right 177 177 * -
trunk/src/wp-includes/rss.php
r25286 r29479 248 248 elseif ($this->feed_type == ATOM and $this->incontent ) { 249 249 // balance tags properly 250 // note: i don't think this is actually neccessary250 // note: This may not actually be necessary 251 251 if ( $this->stack[0] == $el ) 252 252 { … … 725 725 Purpose: add an item to the cache, keyed on url 726 726 Input: url from wich the rss file was fetched 727 Output: true on suc ess727 Output: true on success 728 728 \*=======================================================================*/ 729 729 function set ($url, $rss) { -
trunk/src/wp-includes/wp-diff.php
r29454 r29479 415 415 return $difference; 416 416 417 // Return distance per char cter (of string1)417 // Return distance per character (of string1). 418 418 return $difference / strlen($string1); 419 419 }
Note: See TracChangeset
for help on using the changeset viewer.