aboutsummaryrefslogtreecommitdiff
path: root/vendors
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-12-11 13:47:35 -0500
committerCash Costello <cash.costello@gmail.com>2011-12-11 13:47:35 -0500
commit72c3e7ccdbb316c2a13c38183655d56b0548af59 (patch)
tree534c632a4b157523912b81ede708ae9c040988b8 /vendors
parente26b464a2b05bda04f4c7efee79121866754a72f (diff)
downloadelgg-72c3e7ccdbb316c2a13c38183655d56b0548af59.tar.gz
elgg-72c3e7ccdbb316c2a13c38183655d56b0548af59.tar.bz2
added commit from php-openid fork for better PHP 5.3 support: https://github.com/kost/php-openid/commit/423d95ce64539891f492967c53e8e4effd5dd299
Diffstat (limited to 'vendors')
-rw-r--r--vendors/php-openid/Auth/OpenID/Consumer.php4
-rw-r--r--vendors/php-openid/Auth/OpenID/Server.php2
-rw-r--r--vendors/php-openid/Auth/OpenID/TrustRoot.php2
-rw-r--r--vendors/php-openid/Auth/Yadis/Manager.php2
-rw-r--r--vendors/php-openid/Auth/Yadis/XRDS.php2
-rw-r--r--vendors/php-openid/Auth/Yadis/Yadis.php2
6 files changed, 7 insertions, 7 deletions
diff --git a/vendors/php-openid/Auth/OpenID/Consumer.php b/vendors/php-openid/Auth/OpenID/Consumer.php
index bffed4d62..e480b86f2 100644
--- a/vendors/php-openid/Auth/OpenID/Consumer.php
+++ b/vendors/php-openid/Auth/OpenID/Consumer.php
@@ -666,7 +666,7 @@ class Auth_OpenID_GenericConsumer {
'_completeInvalid');
return call_user_func_array(array($this, $method),
- array($message, &$endpoint, $return_to));
+ array($message, $endpoint, $return_to));
}
/**
@@ -1185,7 +1185,7 @@ class Auth_OpenID_GenericConsumer {
// oidutil.log('Performing discovery on %s' % (claimed_id,))
list($unused, $services) = call_user_func($this->discoverMethod,
$claimed_id,
- &$this->fetcher);
+ $this->fetcher);
if (!$services) {
return new Auth_OpenID_FailureResponse(null,
diff --git a/vendors/php-openid/Auth/OpenID/Server.php b/vendors/php-openid/Auth/OpenID/Server.php
index fb7cc39d2..312a92866 100644
--- a/vendors/php-openid/Auth/OpenID/Server.php
+++ b/vendors/php-openid/Auth/OpenID/Server.php
@@ -1704,7 +1704,7 @@ class Auth_OpenID_Server {
{
if (method_exists($this, "openid_" . $request->mode)) {
$handler = array($this, "openid_" . $request->mode);
- return call_user_func($handler, &$request);
+ return call_user_func($handler, $request);
}
return null;
}
diff --git a/vendors/php-openid/Auth/OpenID/TrustRoot.php b/vendors/php-openid/Auth/OpenID/TrustRoot.php
index 000440b58..0f53958ed 100644
--- a/vendors/php-openid/Auth/OpenID/TrustRoot.php
+++ b/vendors/php-openid/Auth/OpenID/TrustRoot.php
@@ -413,7 +413,7 @@ function Auth_OpenID_getAllowedReturnURLs($relying_party_url, $fetcher,
}
call_user_func_array($discover_function,
- array($relying_party_url, &$fetcher));
+ array($relying_party_url, $fetcher));
$return_to_urls = array();
$matching_endpoints = Auth_OpenID_extractReturnURL($endpoints);
diff --git a/vendors/php-openid/Auth/Yadis/Manager.php b/vendors/php-openid/Auth/Yadis/Manager.php
index ee6f68bcb..5829de6ca 100644
--- a/vendors/php-openid/Auth/Yadis/Manager.php
+++ b/vendors/php-openid/Auth/Yadis/Manager.php
@@ -413,7 +413,7 @@ class Auth_Yadis_Discovery {
list($yadis_url, $services) = call_user_func($discover_cb,
$this->url,
- &$fetcher);
+ $fetcher);
$manager = $this->createManager($services, $yadis_url);
}
diff --git a/vendors/php-openid/Auth/Yadis/XRDS.php b/vendors/php-openid/Auth/Yadis/XRDS.php
index 1f5af96fb..044d1e761 100644
--- a/vendors/php-openid/Auth/Yadis/XRDS.php
+++ b/vendors/php-openid/Auth/Yadis/XRDS.php
@@ -429,7 +429,7 @@ class Auth_Yadis_XRDS {
foreach ($filters as $filter) {
- if (call_user_func_array($filter, array(&$service))) {
+ if (call_user_func_array($filter, array($service))) {
$matches++;
if ($filter_mode == SERVICES_YADIS_MATCH_ANY) {
diff --git a/vendors/php-openid/Auth/Yadis/Yadis.php b/vendors/php-openid/Auth/Yadis/Yadis.php
index 9ea2db7f9..f8853671e 100644
--- a/vendors/php-openid/Auth/Yadis/Yadis.php
+++ b/vendors/php-openid/Auth/Yadis/Yadis.php
@@ -141,7 +141,7 @@ function Auth_Yadis_getServiceEndpoints($input_url, $xrds_parse_func,
}
$yadis_result = call_user_func_array($discover_func,
- array($input_url, &$fetcher));
+ array($input_url, $fetcher));
if ($yadis_result === null) {
return array($input_url, array());