summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/openid/server.php')
-rw-r--r--plugins/openid/server.php21
1 files changed, 12 insertions, 9 deletions
diff --git a/plugins/openid/server.php b/plugins/openid/server.php
index 4a553a78..f2ccf5f2 100644
--- a/plugins/openid/server.php
+++ b/plugins/openid/server.php
@@ -1,7 +1,7 @@
<?php
require_once 'Auth/OpenID/Server.php';
-require_once 'server_ext.php';
+require_once dirname(__FILE__) . '/server_ext.php';
add_filter( 'xrds_simple', 'openid_provider_xrds_simple');
add_action( 'wp_head', 'openid_provider_link_tags');
@@ -44,7 +44,8 @@ function openid_provider_xrds_simple($xrds) {
if (!$user && get_option('openid_blog_owner')) {
$url_parts = parse_url(get_option('home'));
- $path = trailingslashit($url_parts['path']);
+ $path = array_key_exists('path', $url_parts) ? $url_parts['path'] : '';
+ $path = trailingslashit($path);
$script = preg_replace('/index.php$/', '', $_SERVER['SCRIPT_NAME']);
$script = trailingslashit($script);
@@ -54,7 +55,7 @@ function openid_provider_xrds_simple($xrds) {
}
if (!defined('OPENID_DISALLOW_OWNER') || !OPENID_DISALLOW_OWNER) {
- $user = get_userdatabylogin(get_option('openid_blog_owner'));
+ $user = get_user_by('login', get_option('openid_blog_owner'));
}
}
@@ -120,17 +121,19 @@ function openid_provider_xrds_simple($xrds) {
function openid_server_requested_user() {
global $wp_rewrite;
- if ($_REQUEST['author']) {
+ if (array_key_exists('author', $_REQUEST) && $_REQUEST['author']) {
if (is_numeric($_REQUEST['author'])) {
- return get_userdata($_REQUEST['author']);
+ return get_user_by('id', $_REQUEST['author']);
} else {
- return get_userdatabylogin($_REQUEST['author']);
+ return get_user_by('login', $_REQUEST['author']);
}
} else {
$regex = preg_replace('/%author%/', '(.+)', $wp_rewrite->get_author_permastruct());
preg_match('|'.$regex.'|', $_SERVER['REQUEST_URI'], $matches);
- $username = sanitize_user($matches[1], true);
- return get_userdatabylogin($username);
+ if ($matches) {
+ $username = sanitize_user($matches[1], true);
+ return get_user_by('login', $username);
+ }
}
}
@@ -340,7 +343,7 @@ function openid_provider_link_tags() {
if (is_front_page()) {
if (!defined('OPENID_DISALLOW_OWNER') || !OPENID_DISALLOW_OWNER) {
- $user = get_userdatabylogin(get_option('openid_blog_owner'));
+ $user = get_user_by('login', get_option('openid_blog_owner'));
}
} else if (is_author()) {
global $wp_query;