summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortailor <cygnus@janrain.com>2006-08-15 23:31:08 +0000
committertailor <cygnus@janrain.com>2006-08-15 23:31:08 +0000
commitebdbbe446b3ee89116796283001f2515250e5bfe (patch)
tree0d5e9b182c481379c25c8b650f940ae4f01036aa
parentb8fd5e36ac459ffd880a25f8c545e1f5afb6ee73 (diff)
downloadphp-openid-ebdbbe446b3ee89116796283001f2515250e5bfe.zip
php-openid-ebdbbe446b3ee89116796283001f2515250e5bfe.tar.gz
php-openid-ebdbbe446b3ee89116796283001f2515250e5bfe.tar.bz2
[project @ Bugfixes]
-rw-r--r--Services/Yadis/XRI.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Services/Yadis/XRI.php b/Services/Yadis/XRI.php
index 6a8a519..91af490 100644
--- a/Services/Yadis/XRI.php
+++ b/Services/Yadis/XRI.php
@@ -12,6 +12,7 @@
require_once 'Services/Yadis/Misc.php';
require_once 'Services/Yadis/Yadis.php';
require_once 'Services/Yadis/XRDS.php';
+require_once 'Auth/OpenID.php';
$DEFAULT_PROXY = 'http://proxy.xri.net/';
$XRI_AUTHORITIES = array('!', '=', '@', '+', '$', '(');
@@ -39,7 +40,7 @@ function Services_Yadis_identifierScheme($identifier)
function Services_Yadis_toIRINormal($xri)
{
- if (!_startswith($xr, 'xri://')) {
+ if (!_startswith($xri, 'xri://')) {
$xri = 'xri://' . $xri;
}
@@ -60,7 +61,7 @@ function Services_Yadis_escapeForIRI($xri)
global $_xref_re, $_escapeme_re;
$xri = str_replace('%', '%25', $xri);
- $xri = preg_replace($_xref_re, $_escape_xref, $xri);
+ $xri = preg_replace_callback($_xref_re, '_escape_xref', $xri);
return $xri;
}