diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
| commit | b10f362ede8c39746c168363bf4fa6481995592b (patch) | |
| tree | c7a6d4d2ca280ba50d1dbac1113507432e3fe12e /plugins/OpenID | |
| parent | 5ab709b73977131813884558bf56d97172a7aa26 (diff) | |
| parent | fc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OpenID')
| -rw-r--r-- | plugins/OpenID/openid.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 4a76a8791..c5f6d1713 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -36,7 +36,7 @@ function oid_store() { static $store = null; if (!$store) { - # Cannot be called statically + # Can't be called statically $user = new User(); $conn = $user->getDatabaseConnection(); $store = new Auth_OpenID_MySQLStore($conn); @@ -192,7 +192,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $form_html = preg_replace('/&/', '&', $form_html); - // Display an error if the form markup could not be generated; + // Display an error if the form markup couldn't be generated; // otherwise, render the HTML. if (Auth_OpenID::isFailure($form_html)) { common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message)); |