Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / plugins / OpenID / openid.php

diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 4a76a8791e23b1a011ee215f414972b9601f9881..c5f6d171326b1ec3fd0c33ea84632e80773f111d 100644 (file)
--- 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));