Wikinaut has submitted this change and it was merged.
Change subject: chg $wgOpenIDClientAndAlsoProvider to
$wgOpenIDConsumerAndAlsoProvider
......................................................................
chg $wgOpenIDClientAndAlsoProvider to $wgOpenIDConsumerAndAlsoProvider
Change-Id: Iaa835b463ecf50f8f3bedf778a6a3c18f5c7f5e5
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
M SpecialOpenIDDashboard.body.php
M SpecialOpenIDIdentifier.body.php
M SpecialOpenIDServer.body.php
M SpecialOpenIDXRDS.body.php
7 files changed, 18 insertions(+), 18 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CHANGES b/CHANGES
index 497e475..42b933b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
CHANGES
=======
-3.12 20130402 breaking change renamed $wgOpenIDClientOnly to
$wgOpenIDClientAndAlsoProvider
+3.12 20130402 breaking change renamed $wgOpenIDClientOnly to
$wgOpenIDConsumerAndAlsoProvider
and inverting its logic accordingly
3.11 20130401 code cosmetics
3.10 20130318 renamed $wgOpenIDOnly to $wgOpenIDLoginOnly
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index aafa5be..1bc9610 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -18,7 +18,7 @@
class OpenIDHooks {
public static function onSpecialPage_initList( &$list ) {
- global $wgOpenIDLoginOnly, $wgOpenIDClientAndAlsoProvider,
$wgSpecialPageGroups, $wgOpenIDSmallLogoUrl;
+ global $wgOpenIDLoginOnly, $wgOpenIDConsumerAndAlsoProvider,
$wgSpecialPageGroups, $wgOpenIDSmallLogoUrl;
$wgOpenIDSmallLogoUrl = self::getOpenIDSmallLogoUrl();
@@ -33,7 +33,7 @@
# Special pages are added at global scope;
# remove server-related ones if client-only flag is set
$addList = array( 'Login', 'Convert', 'Dashboard', 'Identifier'
);
- if ( $wgOpenIDClientAndAlsoProvider ) {
+ if ( $wgOpenIDConsumerAndAlsoProvider ) {
$addList[] = 'Server';
$addList[] = 'XRDS';
}
@@ -263,9 +263,9 @@
*/
public static function onGetPreferences( $user, &$preferences ) {
global $wgOpenIDShowUrlOnUserPage, $wgHiddenPrefs,
- $wgAuth, $wgUser, $wgLang,
$wgOpenIDClientAndAlsoProvider;
+ $wgAuth, $wgUser, $wgLang,
$wgOpenIDConsumerAndAlsoProvider;
- if ( $wgOpenIDClientAndAlsoProvider ) {
+ if ( $wgOpenIDConsumerAndAlsoProvider ) {
switch ( $wgOpenIDShowUrlOnUserPage ) {
@@ -337,7 +337,7 @@
'type' => 'hidden',
);
- if ( $wgOpenIDClientAndAlsoProvider ) {
+ if ( $wgOpenIDConsumerAndAlsoProvider ) {
$preferences['openid-your-openid'] =
array(
diff --git a/OpenID.php b/OpenID.php
index 8487f75..38db058 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -46,9 +46,9 @@
* If true, user accounts on this wiki can be used as OpenIDs on other
* sites. This is called "OpenID Provider" (or "OpenID Server") mode.
*
- * @deprecated $wgOpenIDClientOnly since E:OpenID v3.12. Use
$wgOpenIDClientAndAlsoProvider with inverted logic instead
+ * @deprecated $wgOpenIDClientOnly since E:OpenID v3.12. Use
$wgOpenIDConsumerAndAlsoProvider with inverted logic instead
*/
-$wgOpenIDClientAndAlsoProvider = true;
+$wgOpenIDConsumerAndAlsoProvider = true;
/**
* If true, users can use their OpenID identity provided by this site A
diff --git a/SpecialOpenIDDashboard.body.php b/SpecialOpenIDDashboard.body.php
index 23239ed..4fcb7fd 100644
--- a/SpecialOpenIDDashboard.body.php
+++ b/SpecialOpenIDDashboard.body.php
@@ -68,7 +68,7 @@
global $wgOpenIDProposeUsernameFromSREG;
global $wgOpenIDAllowAutomaticUsername;
global $wgOpenIDLoginOnly;
- global $wgOpenIDClientAndAlsoProvider;
+ global $wgOpenIDConsumerAndAlsoProvider;
global $wgOpenIDAllowServingOpenIDUserAccounts;
global $wgOpenIDShowProviderIcons;
@@ -94,7 +94,7 @@
$out = $this->show( 'OpenID ' . wfMessage(
'version-software-version' )->text(), MEDIAWIKI_OPENID_VERSION );
$out .= $this->show( 'MediaWiki ' . wfMessage(
'version-software-version' )->text(), SpecialVersion::getVersion() );
$out .= $this->show( '$wgOpenIDLoginOnly', $wgOpenIDLoginOnly );
- $out .= $this->show( '$wgOpenIDClientAndAlsoProvider',
$wgOpenIDClientAndProviderMode );
+ $out .= $this->show( '$wgOpenIDConsumerAndAlsoProvider',
$wgOpenIDClientAndProviderMode );
$out .= $this->show( '$wgOpenIDAllowServingOpenIDUserAccounts',
$wgOpenIDAllowServingOpenIDUserAccounts );
$out .= $this->show( '$wgOpenIDTrustEmailAddress',
$wgOpenIDTrustEmailAddress );
$out .= $this->show( '$wgOpenIDAllowExistingAccountSelection',
$wgOpenIDAllowExistingAccountSelection );
diff --git a/SpecialOpenIDIdentifier.body.php b/SpecialOpenIDIdentifier.body.php
index 0f6152f..92f59d2 100644
--- a/SpecialOpenIDIdentifier.body.php
+++ b/SpecialOpenIDIdentifier.body.php
@@ -29,10 +29,10 @@
}
function execute( $par ) {
- global $wgOpenIDClientAndAlsoProvider, $wgOut;
+ global $wgOpenIDConsumerAndAlsoProvider, $wgOut;
$this->setHeaders();
- if ( !$wgOpenIDClientAndAlsoProvider ) {
+ if ( !$wgOpenIDConsumerAndAlsoProvider ) {
$wgOut->showErrorPage( 'openiderror',
'openidclientonlytext' );
return;
}
@@ -50,7 +50,7 @@
* @param bool $showSpecialPageText
*/
public static function showOpenIDIdentifier( $user, $delegate = false,
$showSpecialPageText = false ) {
- global $wgOut, $wgUser, $wgOpenIDClientAndAlsoProvider,
$wgOpenIDShowUrlOnUserPage,
+ global $wgOut, $wgUser, $wgOpenIDConsumerAndAlsoProvider,
$wgOpenIDShowUrlOnUserPage,
$wgOpenIDAllowServingOpenIDUserAccounts;
// show the own OpenID Url as a subtitle on the user page
@@ -65,7 +65,7 @@
$openid = SpecialOpenID::getUserOpenIDInformation( $user );
# Add OpenID data if its allowed
- if ( $wgOpenIDClientAndAlsoProvider ) {
+ if ( $wgOpenIDConsumerAndAlsoProvider ) {
if ( !( count( $openid )
&& ( strlen( $openid[0]->uoi_openid ) != 0 )
&& !$wgOpenIDAllowServingOpenIDUserAccounts )
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index 67cda37..160cf20 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -54,7 +54,7 @@
}
function execute( $par ) {
- global $wgOut, $wgOpenIDClientAndAlsoProvider,
$wgOpenIDIdentifierSelect;
+ global $wgOut, $wgOpenIDConsumerAndAlsoProvider,
$wgOpenIDIdentifierSelect;
$this->setHeaders();
@@ -62,7 +62,7 @@
# Note: special page is un-registered if this flag is set,
# so it'd be unusual to get here.
- if ( !$wgOpenIDClientAndAlsoProvider ) {
+ if ( !$wgOpenIDConsumerAndAlsoProvider ) {
$wgOut->showErrorPage( 'openiderror',
'openidclientonlytext' );
return;
}
diff --git a/SpecialOpenIDXRDS.body.php b/SpecialOpenIDXRDS.body.php
index 9e3904f..097f4d2 100644
--- a/SpecialOpenIDXRDS.body.php
+++ b/SpecialOpenIDXRDS.body.php
@@ -40,13 +40,13 @@
# $par is a user name
function execute( $par ) {
- global $wgOut, $wgOpenIDClientAndAlsoProvider;
+ global $wgOut, $wgOpenIDConsumerAndAlsoProvider;
# No server functionality if this site is only a client
# Note: special page is un-registered if this flag is set,
# so it'd be unusual to get here.
- if ( !$wgOpenIDClientAndAlsoProvider ) {
+ if ( !$wgOpenIDConsumerAndAlsoProvider ) {
wfHttpError( 404, "Not Found", wfMessage(
'openidclientonlytext' )->text() );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/57057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa835b463ecf50f8f3bedf778a6a3c18f5c7f5e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
