Changeset 18827
- Timestamp:
- 09/29/2011 10:57:43 PM (13 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 9 edited
-
deprecated.php (modified) (2 diffs)
-
kses.php (modified) (9 diffs)
-
l10n.php (modified) (12 diffs)
-
link-template.php (modified) (51 diffs)
-
load.php (modified) (4 diffs)
-
locale.php (modified) (1 diff)
-
media.php (modified) (10 diffs)
-
pomo/translations.php (modified) (1 diff)
-
post-thumbnail-template.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/deprecated.php
r18683 r18827 2732 2732 * 2733 2733 * @param string $title Optional. Link title format. 2734 * @param bool $in_same_cat Optional. Whether link should be in same category.2734 * @param bool $in_same_cat Optional. Whether link should be in a same category. 2735 2735 * @param string $excluded_categories Optional. Excluded categories IDs. 2736 * @param bool $start Optional, default is true. Whether display link to first or last post.2736 * @param bool $start Optional, default is true. Whether to display link to first or last post. 2737 2737 * @return string 2738 2738 */ … … 2772 2772 * 2773 2773 * @param string $title Optional. Link title format. 2774 * @param bool $in_same_cat Optional. Whether link should be in same category.2774 * @param bool $in_same_cat Optional. Whether link should be in a same category. 2775 2775 * @param string $excluded_categories Optional. Excluded categories IDs. 2776 2776 */ -
trunk/wp-includes/kses.php
r18826 r18827 843 843 * 844 844 * The currently implemented checks are "maxlen", "minlen", "maxval", "minval" 845 * and "valueless" with even more checks to come soon.845 * and "valueless". 846 846 * 847 847 * @since 1.0.0 … … 888 888 889 889 case 'minval' : 890 # The minval check checksthat the attribute value is a positive integer,890 # The minval check makes sure that the attribute value is a positive integer, 891 891 # and that it is not smaller than the given value. 892 892 … … 898 898 899 899 case 'valueless' : 900 # The valueless check checksif the attribute has a value900 # The valueless check makes sure if the attribute has a value 901 901 # (like <a href="blah">) or not (<option selected>). If the given value 902 902 # is a "y" or a "Y", the attribute must not have a value. … … 955 955 * Strips slashes from in front of quotes. 956 956 * 957 * This function changes the character sequence \" to just". It leaves all957 * This function changes the character sequence \" to just ". It leaves all 958 958 * other slashes alone. It's really weird, but the quoting from 959 959 * preg_replace(//e) seems to require this. … … 962 962 * 963 963 * @param string $string String to strip slashes 964 * @return string Fixed string swith quoted slashes964 * @return string Fixed string with quoted slashes 965 965 */ 966 966 function wp_kses_stripslashes($string) { … … 1043 1043 * 1044 1044 * This function processes URL protocols, checks to see if they're in the 1045 * white -list or not, and returns different data depending on the answer.1045 * whitelist or not, and returns different data depending on the answer. 1046 1046 * 1047 1047 * @access private … … 1120 1120 * Callback for wp_kses_normalize_entities() regular expression. 1121 1121 * 1122 * This function helps wp_kses_normalize_entities() to only accept 16 1122 * This function helps wp_kses_normalize_entities() to only accept 16-bit values 1123 1123 * and nothing more for &#number; entities. 1124 1124 * … … 1167 1167 * 1168 1168 * @param int $i Unicode value 1169 * @return bool true if the value was a valid Unicode number1169 * @return bool True if the value was a valid Unicode number 1170 1170 */ 1171 1171 function valid_unicode($i) { … … 1343 1343 * 1344 1344 * First removes all of the Kses filters in case the current user does not need 1345 * to have Kses filter the content. If the user does not have unfiltered 1345 * to have Kses filter the content. If the user does not have unfiltered_html 1346 1346 * capability, then Kses filters are added. 1347 1347 * -
trunk/wp-includes/l10n.php
r18639 r18827 17 17 * for the locale global set and the locale is returned. 18 18 * 19 * The process to get the locale should only be done once but the locale will19 * The process to get the locale should only be done once, but the locale will 20 20 * always be filtered using the 'locale' hook. 21 21 * … … 54 54 /** 55 55 * Retrieves the translation of $text. If there is no translation, or 56 * the domain isn't loaded the original text is returned.56 * the domain isn't loaded, the original text is returned. 57 57 * 58 58 * @see __() Don't use translate() directly, use __() … … 85 85 /** 86 86 * Retrieves the translation of $text. If there is no translation, or 87 * the domain isn't loaded the original text is returned.87 * the domain isn't loaded, the original text is returned. 88 88 * 89 89 * @see translate() An alias of translate() … … 100 100 /** 101 101 * Retrieves the translation of $text and escapes it for safe use in an attribute. 102 * If there is no translation, or the domain isn't loaded the original text is returned.102 * If there is no translation, or the domain isn't loaded, the original text is returned. 103 103 * 104 104 * @see translate() An alias of translate() … … 116 116 /** 117 117 * Retrieves the translation of $text and escapes it for safe use in HTML output. 118 * If there is no translation, or the domain isn't loaded the original text is returned.118 * If there is no translation, or the domain isn't loaded, the original text is returned. 119 119 * 120 120 * @see translate() An alias of translate() … … 178 178 * 179 179 * By including the context in the pot file translators can translate the two 180 * string differently.180 * strings differently. 181 181 * 182 182 * @since 2.8.0 … … 258 258 * Register plural strings in POT file, but don't translate them. 259 259 * 260 * Used when you want do keep structures with translatable plural strings and260 * Used when you want to keep structures with translatable plural strings and 261 261 * use them later. 262 262 * … … 292 292 * 293 293 * @since 3.1 294 * @param array $nooped_plural array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()295 * @param int $count number of objects294 * @param array $nooped_plural Array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop() 295 * @param int $count Number of objects 296 296 * @param string $domain Optional. The domain identifier the text should be retrieved in 297 297 */ … … 317 317 * @param string $domain Unique identifier for retrieving translated strings 318 318 * @param string $mofile Path to the .mo file 319 * @return bool true on success, false on failure319 * @return bool True on success, false on failure 320 320 */ 321 321 function load_textdomain( $domain, $mofile ) { … … 374 374 * 375 375 * Loads the .mo file in WP_LANG_DIR constant path from WordPress root. The 376 * translated (.mo) file is named based o ff ofthe locale.376 * translated (.mo) file is named based on the locale. 377 377 * 378 378 * @since 1.5.0 … … 423 423 * 424 424 * @param string $domain Unique identifier for retrieving translated strings 425 * @param string s$mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which426 * the MO file resides. Defaults isempty string.425 * @param string $mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which 426 * the MO file resides. Defaults to empty string. 427 427 */ 428 428 function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) { … … 521 521 * 522 522 * @param string $dir A directory in which to search for language files. The default directory is WP_LANG_DIR. 523 * @return array Array of language codes or an empty array if no languages are present. 523 * @return array Array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names. 524 524 */ 525 525 function get_available_languages( $dir = null ) { -
trunk/wp-includes/link-template.php
r18680 r18827 561 561 * Retrieve the feed link for a category. 562 562 * 563 * Returns a link to the feed for all post in a given category. A specific feed563 * Returns a link to the feed for all posts in a given category. A specific feed 564 564 * can be requested or left blank to get the default feed. 565 565 * … … 577 577 578 578 /** 579 * Retrieve the feed link for a t axonomy.580 * 581 * Returns a link to the feed for all post in a given term. A specific feed579 * Retrieve the feed link for a term. 580 * 581 * Returns a link to the feed for all posts in a given term. A specific feed 582 582 * can be requested or left blank to get the default feed. 583 583 * … … 587 587 * @param string $taxonomy Optional. Taxonomy of $term_id 588 588 * @param string $feed Optional. Feed type. 589 * @return string Link to the feed for the t axonomyspecified by $term_id and $taxonomy.589 * @return string Link to the feed for the term specified by $term_id and $taxonomy. 590 590 */ 591 591 function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) { … … 896 896 * 897 897 * @param int $id Optional. Post ID. 898 * @param string $context Optional, default to display. How to write the '&', defaults to '&'.898 * @param string $context Optional, defaults to display. How to write the '&', defaults to '&'. 899 899 * @return string 900 900 */ … … 1065 1065 * @since 1.5.0 1066 1066 * 1067 * @param bool $in_same_cat Optional. Whether post should be in same category.1067 * @param bool $in_same_cat Optional. Whether post should be in a same category. 1068 1068 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1069 1069 * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. … … 1078 1078 * @since 1.5.0 1079 1079 * 1080 * @param bool $in_same_cat Optional. Whether post should be in same category.1080 * @param bool $in_same_cat Optional. Whether post should be in a same category. 1081 1081 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1082 1082 * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists. … … 1093 1093 * @since 2.5.0 1094 1094 * 1095 * @param bool $in_same_cat Optional. Whether post should be in same category.1095 * @param bool $in_same_cat Optional. Whether post should be in a same category. 1096 1096 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1097 1097 * @param bool $previous Optional. Whether to retrieve previous post. … … 1171 1171 * 1172 1172 * @param string $title Optional. Link title format. 1173 * @param bool $in_same_cat Optional. Whether link should be in same category.1173 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1174 1174 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1175 * @param bool $previous Optional, default is true. Whether display link to previouspost.1175 * @param bool $previous Optional, default is true. Whether to display link to previous or next post. 1176 1176 * @return string 1177 1177 */ … … 1208 1208 * 1209 1209 * @param string $title Optional. Link title format. 1210 * @param bool $in_same_cat Optional. Whether link should be in same category.1210 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1211 1211 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1212 1212 */ … … 1219 1219 * Display relational links for the posts adjacent to the current post for single post pages. 1220 1220 * 1221 * This is meant to be attached to actions like 'wp_head'. 1221 * This is meant to be attached to actions like 'wp_head'. Do not call this directly in plugins or theme templates. 1222 1222 * @since 3.0.0 1223 1223 * … … 1235 1235 * 1236 1236 * @param string $title Optional. Link title format. 1237 * @param bool $in_same_cat Optional. Whether link should be in same category.1237 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1238 1238 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1239 1239 */ … … 1248 1248 * 1249 1249 * @param string $title Optional. Link title format. 1250 * @param bool $in_same_cat Optional. Whether link should be in same category.1250 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1251 1251 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1252 1252 */ … … 1259 1259 * 1260 1260 * Boundary being either the first or last post by publish date within the constraints specified 1261 * by in same category or excludedcategories.1261 * by $in_same_cat or $excluded_categories. 1262 1262 * 1263 1263 * @since 2.8.0 1264 1264 * 1265 * @param bool $in_same_cat Optional. Whether returned post should be in same category.1265 * @param bool $in_same_cat Optional. Whether returned post should be in a same category. 1266 1266 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1267 1267 * @param bool $start Optional. Whether to retrieve first or last post. … … 1307 1307 * @param string $format Optional. Link anchor format. 1308 1308 * @param string $link Optional. Link permalink format. 1309 * @param bool $in_same_cat Optional. Whether link should be in same category.1309 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1310 1310 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1311 1311 */ … … 1321 1321 * @param string $format Optional. Link anchor format. 1322 1322 * @param string $link Optional. Link permalink format. 1323 * @param bool $in_same_cat Optional. Whether link should be in same category.1323 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1324 1324 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1325 1325 */ … … 1337 1337 * @param string $format Link anchor format. 1338 1338 * @param string $link Link permalink format. 1339 * @param bool $in_same_cat Optional. Whether link should be in same category.1339 * @param bool $in_same_cat Optional. Whether link should be in a same category. 1340 1340 * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs. 1341 * @param bool $previous Optional, default is true. Whether display link to previouspost.1341 * @param bool $previous Optional, default is true. Whether to display link to previous or next post. 1342 1342 */ 1343 1343 function adjacent_post_link($format, $link, $in_same_cat = false, $excluded_categories = '', $previous = true) { … … 1371 1371 1372 1372 /** 1373 * Retrieve getlinks for page numbers.1373 * Retrieve links for page numbers. 1374 1374 * 1375 1375 * @since 1.5.0 … … 1433 1433 1434 1434 /** 1435 * Retrieve next posts page slink.1435 * Retrieve next posts page link. 1436 1436 * 1437 1437 * Backported from 2.1.3 to 2.0.10. … … 1455 1455 1456 1456 /** 1457 * Display or return the next posts page slink.1457 * Display or return the next posts page link. 1458 1458 * 1459 1459 * @since 0.71 … … 1472 1472 1473 1473 /** 1474 * Return the next posts page slink.1474 * Return the next posts page link. 1475 1475 * 1476 1476 * @since 2.7.0 … … 1501 1501 1502 1502 /** 1503 * Display the next posts page slink.1503 * Display the next posts page link. 1504 1504 * 1505 1505 * @since 0.71 … … 1514 1514 1515 1515 /** 1516 * Retrieve previous post pageslink.1516 * Retrieve previous posts page link. 1517 1517 * 1518 1518 * Will only return string, if not on a single page or post. … … 1536 1536 1537 1537 /** 1538 * Display or return the previous posts page slink.1538 * Display or return the previous posts page link. 1539 1539 * 1540 1540 * @since 0.71 … … 1552 1552 1553 1553 /** 1554 * Return the previous posts page slink.1554 * Return the previous posts page link. 1555 1555 * 1556 1556 * @since 2.7.0 … … 1637 1637 1638 1638 /** 1639 * Retrieve page numbers links.1639 * Retrieve comments page number link. 1640 1640 * 1641 1641 * @since 2.7.0 … … 1673 1673 1674 1674 /** 1675 * Return the link to next comments page s.1675 * Return the link to next comments page. 1676 1676 * 1677 1677 * @since 2.7.1 … … 1707 1707 1708 1708 /** 1709 * Display the link to next comments page s.1709 * Display the link to next comments page. 1710 1710 * 1711 1711 * @since 2.7.0 … … 1760 1760 * @since 2.7.0 1761 1761 * 1762 * @param string|array $args Optional args. See paginate_links .1762 * @param string|array $args Optional args. See paginate_links(). 1763 1763 * @return string Markup for pagination links. 1764 1764 */ … … 1826 1826 * Retrieve the home url for the current site. 1827 1827 * 1828 * Returns the 'home' option with the appropriate protocol, 1828 * Returns the 'home' option with the appropriate protocol, 'https' if 1829 1829 * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is 1830 1830 * overridden. … … 1836 1836 * 1837 1837 * @param string $path (optional) Path relative to the home url. 1838 * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'1838 * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'. 1839 1839 * @return string Home url link with optional path appended. 1840 1840 */ … … 1846 1846 * Retrieve the home url for a given site. 1847 1847 * 1848 * Returns the 'home' option with the appropriate protocol, 1848 * Returns the 'home' option with the appropriate protocol, 'https' if 1849 1849 * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is 1850 1850 * overridden. … … 1855 1855 * @param int $blog_id (optional) Blog ID. Defaults to current blog. 1856 1856 * @param string $path (optional) Path relative to the home url. 1857 * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'1857 * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'. 1858 1858 * @return string Home url link with optional path appended. 1859 1859 */ … … 1881 1881 * Retrieve the site url for the current site. 1882 1882 * 1883 * Returns the 'site_url' option with the appropriate protocol, 1883 * Returns the 'site_url' option with the appropriate protocol, 'https' if 1884 1884 * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is 1885 1885 * overridden. … … 1891 1891 * 1892 1892 * @param string $path Optional. Path relative to the site url. 1893 * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.1893 * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'. 1894 1894 * @return string Site url link with optional path appended. 1895 1895 */ … … 1901 1901 * Retrieve the site url for a given site. 1902 1902 * 1903 * Returns the 'site_url' option with the appropriate protocol, 1903 * Returns the 'site_url' option with the appropriate protocol, 'https' if 1904 1904 * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is 1905 1905 * overridden. … … 1910 1910 * @param int $blog_id (optional) Blog ID. Defaults to current blog. 1911 1911 * @param string $path Optional. Path relative to the site url. 1912 * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.1912 * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'. 1913 1913 * @return string Site url link with optional path appended. 1914 1914 */ … … 1947 1947 * @since 2.6.0 1948 1948 * 1949 * @param string $path Optional path relative to the admin url 1949 * @param string $path Optional path relative to the admin url. 1950 1950 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 1951 * @return string Admin url link with optional path appended 1951 * @return string Admin url link with optional path appended. 1952 1952 */ 1953 1953 function admin_url( $path = '', $scheme = 'admin' ) { … … 1962 1962 * 1963 1963 * @param int $blog_id (optional) Blog ID. Defaults to current blog. 1964 * @param string $path Optional path relative to the admin url 1964 * @param string $path Optional path relative to the admin url. 1965 1965 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 1966 * @return string Admin url link with optional path appended 1966 * @return string Admin url link with optional path appended. 1967 1967 */ 1968 1968 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) { … … 2055 2055 * Retrieve the site url for the current network. 2056 2056 * 2057 * Returns the site url with the appropriate protocol, 2057 * Returns the site url with the appropriate protocol, 'https' if 2058 2058 * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is 2059 2059 * overridden. … … 2063 2063 * 2064 2064 * @param string $path Optional. Path relative to the site url. 2065 * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.2065 * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'. 2066 2066 * @return string Site url link with optional path appended. 2067 2067 */ … … 2095 2095 * Retrieve the home url for the current network. 2096 2096 * 2097 * Returns the home url with the appropriate protocol, 2097 * Returns the home url with the appropriate protocol, 'https' if 2098 2098 * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is 2099 2099 * overridden. … … 2103 2103 * 2104 2104 * @param string $path (optional) Path relative to the home url. 2105 * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'2105 * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'. 2106 2106 * @return string Home url link with optional path appended. 2107 2107 */ … … 2131 2131 * @since 3.0.0 2132 2132 * 2133 * @param string $path Optional path relative to the admin url 2133 * @param string $path Optional path relative to the admin url. 2134 2134 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 2135 * @return string Admin url link with optional path appended 2135 * @return string Admin url link with optional path appended. 2136 2136 */ 2137 2137 function network_admin_url( $path = '', $scheme = 'admin' ) { … … 2153 2153 * @since 3.0.0 2154 2154 * 2155 * @param string $path Optional path relative to the admin url 2155 * @param string $path Optional path relative to the admin url. 2156 2156 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 2157 * @return string Admin url link with optional path appended 2157 * @return string Admin url link with optional path appended. 2158 2158 */ 2159 2159 function user_admin_url( $path = '', $scheme = 'admin' ) { … … 2172 2172 * @since 3.1.0 2173 2173 * 2174 * @param string $path Optional path relative to the admin url 2174 * @param string $path Optional path relative to the admin url. 2175 2175 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 2176 * @return string Admin url link with optional path appended 2176 * @return string Admin url link with optional path appended. 2177 2177 */ 2178 2178 function self_admin_url($path = '', $scheme = 'admin') { … … 2188 2188 * Get the URL to the user's dashboard. 2189 2189 * 2190 * If a user does not belong to any site s, the global user dashboard is used. If the user belongs to the current site,2191 * the dashboard for the current site is returned. 2190 * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site, 2191 * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's 2192 2192 * primary blog is returned. 2193 2193 * … … 2195 2195 * 2196 2196 * @param int $user_id User ID 2197 * @param string $path Optional path relative to the dashboard. 2197 * @param string $path Optional path relative to the dashboard. Use only paths known to both blog and user admins. 2198 2198 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 2199 * @return string Dashboard url link with optional path appended 2199 * @return string Dashboard url link with optional path appended. 2200 2200 */ 2201 2201 function get_dashboard_url( $user_id, $path = '', $scheme = 'admin' ) { … … 2230 2230 * @param int $user User ID 2231 2231 * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes. 2232 * @return string Dashboard url link with optional path appended 2232 * @return string Dashboard url link with optional path appended. 2233 2233 */ 2234 2234 function get_edit_profile_url( $user, $scheme = 'admin' ) { … … 2246 2246 2247 2247 /** 2248 * Output rel=canonical for singular queries 2248 * Output rel=canonical for singular queries. 2249 2249 * 2250 2250 * @package WordPress … … 2266 2266 * Return a shortlink for a post, page, attachment, or blog. 2267 2267 * 2268 * This function exists to provide a shortlink tag that all themes and plugins can target. 2269 * provide the actual shortlinks. 2270 * Plugins can short 2268 * This function exists to provide a shortlink tag that all themes and plugins can target. A plugin must hook in to 2269 * provide the actual shortlinks. Default shortlink support is limited to providing ?p= style links for posts. 2270 * Plugins can short-circuit this function via the pre_get_shortlink filter or filter the output 2271 2271 * via the get_shortlink filter. 2272 2272 * 2273 2273 * @since 3.0.0. 2274 2274 * 2275 * @param int $id A post or blog id. 2275 * @param int $id A post or blog id. Default is 0, which means the current post or blog. 2276 2276 * @param string $context Whether the id is a 'blog' id, 'post' id, or 'media' id. If 'post', the post_type of the post is consulted. If 'query', the current query is consulted to determine the id and context. Default is 'post'. 2277 2277 * @param bool $allow_slugs Whether to allow post slugs in the shortlink. It is up to the plugin how and whether to honor this. … … 2353 2353 * @since 3.0.0 2354 2354 * 2355 * @param string $text Optional The link text or HTML to be displayed. 2356 * @param string $title Optional The tooltip for the link. Must be sanitized.Defaults to the sanitized post title.2355 * @param string $text Optional The link text or HTML to be displayed. Defaults to 'This is the short link.' 2356 * @param string $title Optional The tooltip for the link. Must be sanitized. Defaults to the sanitized post title. 2357 2357 * @param string $before Optional HTML to display before the link. 2358 * @param string $ beforeOptional HTML to display after the link.2358 * @param string $after Optional HTML to display after the link. 2359 2359 */ 2360 2360 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) { -
trunk/wp-includes/load.php
r18545 r18827 187 187 * @access private 188 188 * @since 0.71 189 * @global int $timestart Seconds and Microseconds added together from when function is called.189 * @global int $timestart Seconds and microseconds added together from when function is called. 190 190 * @return bool Always returns true. 191 191 */ … … 211 211 * </code> 212 212 * which will do what the above does. If you need the result, you can assign it to a variable, but 213 * most cases, you only need to echo it.213 * in most cases, you only need to echo it. 214 214 * 215 215 * @since 0.71 216 * @global int $timestart Seconds and Microseconds added together from when timer_start() is called217 * @global int $timeend Seconds and Microseconds added together from when function is called216 * @global int $timestart Seconds and microseconds added together from when timer_start() is called 217 * @global int $timeend Seconds and microseconds added together from when function is called 218 218 * 219 219 * @param int $display Use '0' or null to not echo anything and 1 to echo the total time … … 288 288 * To set directory manually, define <code>WP_LANG_DIR</code> in wp-config.php. 289 289 * 290 * If the language directory exists within WP_CONTENT_DIR that is used291 * Otherwise if the language directory exists within WPINC, that's used 292 * Finally, If neither of the preceeding directories isfound,290 * If the language directory exists within WP_CONTENT_DIR, that is used. 291 * Otherwise if the language directory exists within WPINC, that's used. 292 * Finally, if neither of the preceding directories are found, 293 293 * WP_CONTENT_DIR/languages is used. 294 294 * … … 397 397 // Sometimes advanced-cache.php can load object-cache.php before it is loaded here. 398 398 // This breaks the function_exists check above and can result in $_wp_using_ext_object_cache 399 // being set incorrectly. 399 // being set incorrectly. Double check if an external cache exists. 400 400 $_wp_using_ext_object_cache = true; 401 401 } -
trunk/wp-includes/locale.php
r18639 r18827 26 26 * 27 27 * There is a hack to make sure that Tuesday and Thursday, as well 28 * as Sunday and Saturday don't conflict. See init() method for more.28 * as Sunday and Saturday, don't conflict. See init() method for more. 29 29 * 30 30 * @see WP_Locale::init() for how to handle the hack. -
trunk/wp-includes/media.php
r18639 r18827 18 18 * not set. 19 19 * 20 * Finally, there is a filter named , 'editor_max_image_size'that will be called20 * Finally, there is a filter named 'editor_max_image_size', that will be called 21 21 * on the calculated array for width and height, respectively. The second 22 22 * parameter will be the value that was in the $size parameter. The returned … … 178 178 /** 179 179 * Registers a new image size 180 * 181 * @since 2.9.0 180 182 */ 181 183 function add_image_size( $name, $width = 0, $height = 0, $crop = false ) { … … 186 188 /** 187 189 * Registers an image size for the post thumbnail 190 * 191 * @since 2.9.0 188 192 */ 189 193 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) { … … 330 334 * @param int $dest_h New height. 331 335 * @param bool $crop Optional, default is false. Whether to crop image or resize. 332 * @return bool|array False ,on failure. Returned array matches parameters for imagecopyresampled() PHP function.336 * @return bool|array False on failure. Returned array matches parameters for imagecopyresampled() PHP function. 333 337 */ 334 338 function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) { … … 399 403 * @param int $max_h Maximum height to resize to. 400 404 * @param bool $crop Optional. Whether to crop image or resize. 401 * @param string $suffix Optional. File Suffix.405 * @param string $suffix Optional. File suffix. 402 406 * @param string $dest_path Optional. New image file path. 403 407 * @param int $jpeg_quality Optional, default is 90. Image quality percentage. … … 670 674 671 675 /** 672 * Adds a 'wp-post-image' class to post thumbnail thumbnails676 * Adds a 'wp-post-image' class to post thumbnails 673 677 * Uses the begin_fetch_post_thumbnail_html and end_fetch_post_thumbnail_html action hooks to 674 * dynamically add/remove itself so as to only filter post thumbnail thumbnails678 * dynamically add/remove itself so as to only filter post thumbnails 675 679 * 676 680 * @since 2.9.0 … … 753 757 * @since 2.5.0 754 758 * 755 * @param array $attr Attributes attributed tothe shortcode.759 * @param array $attr Attributes of the shortcode. 756 760 * @return string HTML content to display gallery. 757 761 */ … … 907 911 * @since 2.5.0 908 912 * 909 * @param bool $prev Optional. Default is true to display previous link, true for next.913 * @param bool $prev Optional. Default is true to display previous link, false for next. 910 914 */ 911 915 function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) { … … 1080 1084 1081 1085 /** 1082 * If a post/page was saved, then output Java script to make1086 * If a post/page was saved, then output JavaScript to make 1083 1087 * an AJAX request that will call WP_Embed::cache_oembed(). 1084 1088 */ … … 1374 1378 * 1375 1379 * @param string $url The URL that should be embedded. 1376 * @param array $args Add tional arguments and parameters.1380 * @param array $args Additional arguments and parameters. 1377 1381 * @return string The original URL on failure or the embed HTML on success. 1378 1382 */ -
trunk/wp-includes/pomo/translations.php
r18528 r18827 82 82 * Given the number of items, returns the 0-based index of the plural form to use 83 83 * 84 * Here, in the base Translations class, the common g logic for English is implmented:84 * Here, in the base Translations class, the common logic for English is implemented: 85 85 * 0 if there is one element, 1 otherwise 86 86 * -
trunk/wp-includes/post-thumbnail-template.php
r17883 r18827 51 51 * Update cache for thumbnails in the current loop 52 52 * 53 * @si cne 3.253 * @since 3.2 54 54 */ 55 55 function update_post_thumbnail_cache() {
Note: See TracChangeset
for help on using the changeset viewer.