<!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>[10267] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php: Plugin Directory: Redirect plugins to their canonical location, avoiding mixed case urls.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/10267">10267</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10267","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-16 06:54:10 +0000 (Wed, 16 Sep 2020)</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'>Plugin Directory: Redirect plugins to their canonical location, avoiding mixed case urls.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5324">#5324</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2020-09-16 06:02:02 UTC (rev 10266)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2020-09-16 06:54:10 UTC (rev 10267)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,12 +976,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Adjust the login URL to point back to whatever part of the support forums we're
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adjust the login URL to point back to whatever part of the plugin directory we're
</ins><span class="cx" style="display: block; padding: 0 10px"> * currently looking at. This allows the redirect to come back to the same place
</span><span class="cx" style="display: block; padding: 0 10px"> * instead of the main /support URL by default.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function fix_login_url( $login_url, $redirect, $force_reauth ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // modify the redirect_to for the support forums to point to the current page
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // modify the redirect_to for the plugin directory to point to the current page
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $_SERVER['REQUEST_URI'], '/plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Note that this is not normal because of the code in /mu-plugins/wporg-sso/class-wporg-sso.php.
</span><span class="cx" style="display: block; padding: 0 10px"> // The login_url function there expects the redirect_to as the first parameter passed into it instead of the second
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1004,7 +1004,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $login_url;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns the requested page's content, translated.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1269,6 +1268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Handles all the custom redirects needed in the Plugin Directory.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function custom_redirects() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_query;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Handle a redirect for /$plugin/$tab_name/ to /$plugin/#$tab_name.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_query_var( 'redirect_plugin' ) && get_query_var( 'redirect_plugin_tab' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( site_url( get_query_var( 'redirect_plugin' ) . '/#' . get_query_var( 'redirect_plugin_tab' ) ), 301 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1333,6 +1334,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Redirect mixed-case plugin names to the canonical location.
+ if (
+ get_query_var( 'name' ) && // A sanitized lowercase value is here
+ is_singular() &&
+ ! empty( $wp_query->query['name'] ) && // The raw value is available here.
+ get_query_var( 'name' ) != $wp_query->query['name']
+ ) {
+ $url = get_permalink();
+ if ( get_query_var( 'plugin_advanced' ) ) {
+ $url .= 'advanced/';
+ }
+
+ wp_safe_redirect( $url, 301 );
+ die();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If it's an old search query, handle that too.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'search.php' == get_query_var( 'name' ) && isset( $_GET['q'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( site_url( '/search/' . urlencode( wp_unslash( $_GET['q'] ) ) . '/' ), 301 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1381,7 +1398,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // disable feeds
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable feeds
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_feed() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['feed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( esc_url_raw( remove_query_arg( 'feed' ) ), 301 );
</span></span></pre>
</div>
</div>
</body>
</html>