summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2018-03-10 19:18:59 -0500
committerAnthony G. Basile <blueness@gentoo.org>2018-03-10 19:18:59 -0500
commit8370303a3d5f30b78ae37116ca2df8c7525d9e49 (patch)
tree3068eded62cf46faf6be67959c546ad4a55176e2 /plugins/openid/lib/Auth/OpenID/URINorm.php
parentUpdate jetpack 5.9 (diff)
downloadblogs-gentoo-8370303a3d5f30b78ae37116ca2df8c7525d9e49.tar.gz
blogs-gentoo-8370303a3d5f30b78ae37116ca2df8c7525d9e49.tar.bz2
blogs-gentoo-8370303a3d5f30b78ae37116ca2df8c7525d9e49.zip
Update openid 3.4.4
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'plugins/openid/lib/Auth/OpenID/URINorm.php')
-rw-r--r--plugins/openid/lib/Auth/OpenID/URINorm.php14
1 files changed, 3 insertions, 11 deletions
diff --git a/plugins/openid/lib/Auth/OpenID/URINorm.php b/plugins/openid/lib/Auth/OpenID/URINorm.php
index 32e84588..f8c73ada 100644
--- a/plugins/openid/lib/Auth/OpenID/URINorm.php
+++ b/plugins/openid/lib/Auth/OpenID/URINorm.php
@@ -84,11 +84,8 @@ function Auth_OpenID_pct_encoded_replace_unreserved($mo)
$i = intval($mo[1], 16);
if ($_unreserved[$i]) {
return chr($i);
- } else {
- return strtoupper($mo[0]);
}
-
- return $mo[0];
+ return strtoupper($mo[0]);
}
function Auth_OpenID_pct_encoded_replace($mo)
@@ -168,11 +165,6 @@ function Auth_OpenID_urinorm($uri)
}
$scheme = $uri_matches[2];
- if ($scheme) {
- $scheme = strtolower($scheme);
- }
-
- $scheme = $uri_matches[2];
if ($scheme === '') {
// No scheme specified
return null;
@@ -204,13 +196,13 @@ function Auth_OpenID_urinorm($uri)
}
}
- list($_whole, $userinfo, $host, $port) = $authority_matches;
+ list(, $userinfo, $host, $port) = $authority_matches;
if ($userinfo === null) {
$userinfo = '';
}
- if (strpos($host, '%') !== -1) {
+ if (strpos($host, '%') !== false) {
$host = strtolower($host);
$host = preg_replace_callback(
Auth_OpenID_getEncodedPattern(),