<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37259] trunk/src/wp-includes/link-template.php: Docs: Capitalize URL ?\226?\128?\147 an acronym for Uniform Resource Locator ?\226?\128?\147 when used in the context of inline docs in wp-includes/link-template.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37259">37259</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37259","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>DrewAPicture</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-20 14:46:02 +0000 (Wed, 20 Apr 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Capitalize URL ?\226?\128?\147 an acronym for Uniform Resource Locator ?\226?\128?\147 when used in the context of inline docs in wp-includes/link-template.php.
Fixes <a href="https://core.trac.wordpress.org/ticket/30406">#30406</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2016-04-20 14:36:57 UTC (rev 37258)
+++ trunk/src/wp-includes/link-template.php 2016-04-20 14:46:02 UTC (rev 37259)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2962,10 +2962,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the home url. Default empty.
- * @param string|null $scheme Optional. Scheme to give the home url context. Accepts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the home URL. Default empty.
+ * @param string|null $scheme Optional. Scheme to give the home URL context. Accepts
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'http', 'https', 'relative', 'rest', or null. Default null.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Home url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Home URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function home_url( $path = '', $scheme = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_home_url( null, $path, $scheme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3038,9 +3038,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the site url. Default empty.
- * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
- * @return string Site url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the site URL. Default empty.
+ * @param string $scheme Optional. Scheme to give the site URL context. See set_url_scheme().
+ * @return string Site URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function site_url( $path = '', $scheme = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_site_url( null, $path, $scheme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3057,11 +3057,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id Optional. Site ID. Default null (current site).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the site url. Default empty.
- * @param string $scheme Optional. Scheme to give the site url context. Accepts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the site URL. Default empty.
+ * @param string $scheme Optional. Scheme to give the site URL context. Accepts
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'http', 'https', 'login', 'login_post', 'admin', or
</span><span class="cx" style="display: block; padding: 0 10px"> * 'relative'. Default null.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Site url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Site URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $blog_id ) || !is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3096,10 +3096,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional path relative to the admin url.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional path relative to the admin URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl().
</span><span class="cx" style="display: block; padding: 0 10px"> * 'http' or 'https' can be passed to force those schemes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Admin url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Admin URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_admin_url( null, $path, $scheme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3111,11 +3111,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $blog_id Optional. Site ID. Default null (current site).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the admin url. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the admin URL. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme Optional. The scheme to use. Accepts 'http' or 'https',
</span><span class="cx" style="display: block; padding: 0 10px"> * to force those schemes. Default 'admin', which obeys
</span><span class="cx" style="display: block; padding: 0 10px"> * force_ssl_admin() and is_ssl().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Admin url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Admin URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_site_url($blog_id, 'wp-admin/', $scheme);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3140,10 +3140,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the includes url. Default empty.
- * @param string $scheme Optional. Scheme to give the includes url context. Accepts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the includes URL. Default empty.
+ * @param string $scheme Optional. Scheme to give the includes URL context. Accepts
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'http', 'https', or 'relative'. Default null.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Includes url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Includes URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function includes_url( $path = '', $scheme = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = site_url( '/' . WPINC . '/', $scheme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3168,8 +3168,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the content url. Default empty.
- * @return string Content url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the content URL. Default empty.
+ * @return string Content URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function content_url( $path = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( WP_CONTENT_URL );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3243,7 +3243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the site URL for the current network.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the site url with the appropriate protocol, 'https' if
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the site URL with the appropriate protocol, 'https' if
</ins><span class="cx" style="display: block; padding: 0 10px"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx" style="display: block; padding: 0 10px"> * overridden.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3251,10 +3251,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see set_url_scheme()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the site url. Default empty.
- * @param string $scheme Optional. Scheme to give the site url context. Accepts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the site URL. Default empty.
+ * @param string $scheme Optional. Scheme to give the site URL context. Accepts
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'http', 'https', or 'relative'. Default null.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Site url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Site URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function network_site_url( $path = '', $scheme = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3287,16 +3287,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the home URL for the current network.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the home url with the appropriate protocol, 'https' is_ssl()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the home URL with the appropriate protocol, 'https' is_ssl()
</ins><span class="cx" style="display: block; padding: 0 10px"> * and 'http' otherwise. If `$scheme` is 'http' or 'https', `is_ssl()` is
</span><span class="cx" style="display: block; padding: 0 10px"> * overridden.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the home url. Default empty.
- * @param string $scheme Optional. Scheme to give the home url context. Accepts
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the home URL. Default empty.
+ * @param string $scheme Optional. Scheme to give the home URL context. Accepts
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'http', 'https', or 'relative'. Default null.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Home url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Home URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function network_home_url( $path = '', $scheme = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3335,10 +3335,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional path relative to the admin url. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional path relative to the admin URL. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme Optional. The scheme to use. Default is 'admin', which obeys force_ssl_admin()
</span><span class="cx" style="display: block; padding: 0 10px"> * and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Admin url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Admin URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function network_admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3366,10 +3366,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the admin url. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the admin URL. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme Optional. The scheme to use. Default is 'admin', which obeys force_ssl_admin()
</span><span class="cx" style="display: block; padding: 0 10px"> * and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Admin url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Admin URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function user_admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = network_site_url('wp-admin/user/', $scheme);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3394,10 +3394,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path Optional. Path relative to the admin url. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path Optional. Path relative to the admin URL. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme Optional. The scheme to use. Default is 'admin', which obeys force_ssl_admin()
</span><span class="cx" style="display: block; padding: 0 10px"> * and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Admin url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Admin URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function self_admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3414,7 +3414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 The 'rest' scheme was added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $url Absolute url that includes a scheme
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $url Absolute URL that includes a scheme
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|null $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string $url URL with chosen scheme.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3469,7 +3469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * both site and user admins. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin()
</span><span class="cx" style="display: block; padding: 0 10px"> * and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Dashboard url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Dashboard URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $user_id ? (int) $user_id : get_current_user_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3514,7 +3514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id Optional. User ID. Defaults to current user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $scheme Optional. The scheme to use. Default is 'admin', which obeys force_ssl_admin()
</span><span class="cx" style="display: block; padding: 0 10px"> * and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Dashboard url link with optional path appended.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Dashboard URL link with optional path appended.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $user_id ? (int) $user_id : get_current_user_id();
</span></span></pre>
</div>
</div>
</body>
</html>