| Index: trunk/extensions/OpenID/README.OpenID-mediawiki-extension |
| — | — | @@ -1,5 +1,5 @@ |
| 2 | 2 | MediaWiki OpenID extension README.OpenID-mediawiki-extension file |
| 3 | | -version 0.938-beta 20110920 |
| | 3 | +version 0.939-beta 20110922 |
| 4 | 4 | |
| 5 | 5 | Homepage and manual http://www.mediawiki.org/wiki/Extension:OpenID |
| 6 | 6 | |
| — | — | @@ -421,15 +421,6 @@ |
| 422 | 422 | $wgOpenIDProposeUsernameFromSREG = false; |
| 423 | 423 | $wgOpenIDAllowAutomaticUsername = false; |
| 424 | 424 | |
| 425 | | - |
| 426 | | -== Skins == |
| 427 | | - |
| 428 | | -If you are customizing a skin, and you want to show the OpenID |
| 429 | | -identity for a user (say, on their user page), use the function |
| 430 | | -OpenIDGetUserUrl($user). It takes a User object (not a name or an id!) |
| 431 | | -and returns the user's OpenID identity if it exists, or null if it |
| 432 | | -doesn't. |
| 433 | | - |
| 434 | 425 | == Translation == |
| 435 | 426 | |
| 436 | 427 | The user interface strings for this extension are configurable and all start |
| — | — | @@ -476,6 +467,7 @@ |
| 477 | 468 | into that account now |
| 478 | 469 | |
| 479 | 470 | == CHANGES == |
| | 471 | +* 0.939 function name changes |
| 480 | 472 | * 0.938 list uoi_user_registration timestamp if present in openid-preference tab |
| 481 | 473 | * 0.937 added uoi_user_registration timestamp field (bug30623) |
| 482 | 474 | * 0.934 fixes |
| Index: trunk/extensions/OpenID/OpenID.hooks.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | if ( $nt && $nt->getNamespace() == NS_USER && strpos( $nt->getText(), '/' ) === false ) { |
| 60 | 60 | $user = User::newFromName( $nt->getText() ); |
| 61 | 61 | if ( $user && $user->getID() != 0 ) { |
| 62 | | - $openid = SpecialOpenID::getUserUrl( $user ); |
| | 62 | + $openid = SpecialOpenID::getUserOpenIDInformation( $user ); |
| 63 | 63 | if ( count( $openid ) && strlen( $openid[0] ) != 0 ) { |
| 64 | 64 | global $wgOpenIDShowUrlOnUserPage; |
| 65 | 65 | |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | |
| 136 | 136 | private static function getInfoTable( $user ) { |
| 137 | 137 | global $wgLang; |
| 138 | | - $openid_urls_registration = SpecialOpenID::getUserUrl( $user ); |
| | 138 | + $openid_urls_registration = SpecialOpenID::getUserOpenIDInformation( $user ); |
| 139 | 139 | $delTitle = SpecialPage::getTitleFor( 'OpenIDConvert', 'Delete' ); |
| 140 | 140 | $sk = $user->getSkin(); |
| 141 | 141 | $rows = ''; |
| Index: trunk/extensions/OpenID/patches/patch-uoi_user_registration-not-present.sql |
| — | — | @@ -0,0 +1,4 @@ |
| | 2 | +-- |
| | 3 | +-- SQL schema update for OpenID extension to add the uoi_user_registration field |
| | 4 | +-- |
| | 5 | +ALTER TABLE /*_*/user_openid ADD uoi_user_registration BINARY(14); |
| Index: trunk/extensions/OpenID/SpecialOpenIDServer.body.php |
| — | — | @@ -246,7 +246,7 @@ |
| 247 | 247 | |
| 248 | 248 | # Is the user an OpenID user? |
| 249 | 249 | |
| 250 | | - if ( !$wgOpenIDAllowServingOpenIDUserAccounts && $this->getUserUrl( $user ) ) { |
| | 250 | + if ( !$wgOpenIDAllowServingOpenIDUserAccounts && $this->getUserOpenIDInformation( $user ) ) { |
| 251 | 251 | wfDebug( "OpenID: Not one of our users; logs in with OpenID.\n" ); |
| 252 | 252 | return $request->answer( false, $this->serverUrl() ); |
| 253 | 253 | } |
| Index: trunk/extensions/OpenID/SpecialOpenID.body.php |
| — | — | @@ -326,9 +326,9 @@ |
| 327 | 327 | $wgRequest->response()->setcookie( 'OpenID', $openid, time() + $wgOpenIDCookieExpiration ); |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | | - # Find the user with the given openid, if any |
| 331 | | - # return openid url and registration timestamp |
| 332 | | - public static function getUserUrl( $user ) { |
| | 330 | + # Find the user with the given openid |
| | 331 | + # return the registered OpenID urls and registration timestamps (if available) |
| | 332 | + public static function getUserOpenIDInformation( $user ) { |
| 333 | 333 | $openid_urls_registration = array(); |
| 334 | 334 | |
| 335 | 335 | if ( $user instanceof User && $user->getId() != 0 ) { |
| Index: trunk/extensions/OpenID/SpecialOpenIDConvert.body.php |
| — | — | @@ -161,7 +161,7 @@ |
| 162 | 162 | $wgOut->setPageTitle( wfMsg( 'openiddelete' ) ); |
| 163 | 163 | |
| 164 | 164 | # Check if the user is removing it's last OpenID url |
| 165 | | - $urls = self::getUserUrl( $wgUser ); |
| | 165 | + $urls = self::getUserOpenIDInformation( $wgUser ); |
| 166 | 166 | if ( count( $urls ) == 1 ) { |
| 167 | 167 | if ( $wgUser->mPassword == '' ) { |
| 168 | 168 | $wgOut->showErrorPage( 'openiderror', 'openiddeleteerrornopassword' ); |
| Index: trunk/extensions/OpenID/OpenID.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | exit( 1 ); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | | -define( 'MEDIAWIKI_OPENID_VERSION', '0.938-beta 20110920' ); |
| | 31 | +define( 'MEDIAWIKI_OPENID_VERSION', '0.939-beta 20110922' ); |
| 32 | 32 | |
| 33 | 33 | $path = dirname( __FILE__ ); |
| 34 | 34 | set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . get_include_path() ); |