[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Call echo related hooks

2016-12-03 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Call echo related hooks
..


Call echo related hooks

Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Follow-up: 278868
---
M SocialProfile.php
1 file changed, 29 insertions(+), 0 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/SocialProfile.php b/SocialProfile.php
index f4b722a..605f46c 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -37,6 +37,9 @@
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
+$wgAutoloadClasses['EchoUserBoardMessagePresentationModel'] = __DIR__ . 
'/UserBoard/EchoUserBoardMessagePresentationModel.php';
+$wgAutoloadClasses['EchoUserRelationshipPresentationModel'] = __DIR__ . 
'/UserRelationship/EchoUserRelationshipPresentationModel.php';
+$wgAutoloadClasses['EchoUserLevelAdvancePresentationModel'] = __DIR__ . 
'/UserStats/EchoUserLevelAdvancePresentationModel.php';
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
 $wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
@@ -52,9 +55,12 @@
 $wgAutoloadClasses['RemoveAvatar'] = __DIR__ . 
'/UserProfile/SpecialRemoveAvatar.php';
 $wgAutoloadClasses['UpdateEditCounts'] = __DIR__ . 
'/UserStats/SpecialUpdateEditCounts.php';
 $wgAutoloadClasses['UserBoard'] = __DIR__ . '/UserBoard/UserBoardClass.php';
+$wgAutoloadClasses['UserBoardHooks'] = __DIR__ . 
'/UserBoard/UserBoardHooks.php';
 $wgAutoloadClasses['UserProfile'] = __DIR__ . 
'/UserProfile/UserProfileClass.php';
 $wgAutoloadClasses['UserProfilePage'] = __DIR__ . 
'/UserProfile/UserProfilePage.php';
 $wgAutoloadClasses['UserRelationship'] = __DIR__ . 
'/UserRelationship/UserRelationshipClass.php';
+$wgAutoloadClasses['UserRelationshipHooks'] = __DIR__ . 
'/UserRelationship/UserRelationshipHooks.php';
+$wgAutoloadClasses['UserStatsHooks'] = __DIR__ . 
'/UserStats/UserStatsHooks.php';
 $wgAutoloadClasses['UserLevel'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStats'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStatsTrack'] = __DIR__ . 
'/UserStats/UserStatsClass.php';
@@ -80,6 +86,29 @@
 $wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
 $wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
+// Echo (Notifications) stuff
+// UserBoard
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserBoardHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserBoardHooks::onEchoGetDefaultNotifiedUsers';
+$wgHooks['EchoGetBundleRules'][] = 'UserBoardHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-msg'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-msg'] = false;
+
+// UserRelationship
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserRelationshipHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserRelationshipHooks::onEchoGetDefaultNotifiedUsers';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-rel'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-rel'] = false;
+
+// UserStats
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserStatsHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetBundleRules'][] = 'UserStatsHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-level-up'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-level-up'] = false;
+
 // New special pages
 $wgSpecialPages['AddRelationship'] = 'SpecialAddRelationship';
 $wgSpecialPages['EditProfile'] = 'SpecialEditProfile';

-- 
To view, visit https://gerrit.wikimedia.org/r/325141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Call echo related hooks

2016-12-03 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325141

Change subject: Call echo related hooks
..

Call echo related hooks

Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Follow-up: 278868
---
M SocialProfile.php
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/41/325141/1

diff --git a/SocialProfile.php b/SocialProfile.php
index f4b722a..605f46c 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -37,6 +37,9 @@
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
+$wgAutoloadClasses['EchoUserBoardMessagePresentationModel'] = __DIR__ . 
'/UserBoard/EchoUserBoardMessagePresentationModel.php';
+$wgAutoloadClasses['EchoUserRelationshipPresentationModel'] = __DIR__ . 
'/UserRelationship/EchoUserRelationshipPresentationModel.php';
+$wgAutoloadClasses['EchoUserLevelAdvancePresentationModel'] = __DIR__ . 
'/UserStats/EchoUserLevelAdvancePresentationModel.php';
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
 $wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
@@ -52,9 +55,12 @@
 $wgAutoloadClasses['RemoveAvatar'] = __DIR__ . 
'/UserProfile/SpecialRemoveAvatar.php';
 $wgAutoloadClasses['UpdateEditCounts'] = __DIR__ . 
'/UserStats/SpecialUpdateEditCounts.php';
 $wgAutoloadClasses['UserBoard'] = __DIR__ . '/UserBoard/UserBoardClass.php';
+$wgAutoloadClasses['UserBoardHooks'] = __DIR__ . 
'/UserBoard/UserBoardHooks.php';
 $wgAutoloadClasses['UserProfile'] = __DIR__ . 
'/UserProfile/UserProfileClass.php';
 $wgAutoloadClasses['UserProfilePage'] = __DIR__ . 
'/UserProfile/UserProfilePage.php';
 $wgAutoloadClasses['UserRelationship'] = __DIR__ . 
'/UserRelationship/UserRelationshipClass.php';
+$wgAutoloadClasses['UserRelationshipHooks'] = __DIR__ . 
'/UserRelationship/UserRelationshipHooks.php';
+$wgAutoloadClasses['UserStatsHooks'] = __DIR__ . 
'/UserStats/UserStatsHooks.php';
 $wgAutoloadClasses['UserLevel'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStats'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStatsTrack'] = __DIR__ . 
'/UserStats/UserStatsClass.php';
@@ -80,6 +86,29 @@
 $wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
 $wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
+// Echo (Notifications) stuff
+// UserBoard
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserBoardHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserBoardHooks::onEchoGetDefaultNotifiedUsers';
+$wgHooks['EchoGetBundleRules'][] = 'UserBoardHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-msg'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-msg'] = false;
+
+// UserRelationship
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserRelationshipHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserRelationshipHooks::onEchoGetDefaultNotifiedUsers';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-rel'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-rel'] = false;
+
+// UserStats
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserStatsHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetBundleRules'][] = 'UserStatsHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-level-up'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-level-up'] = false;
+
 // New special pages
 $wgSpecialPages['AddRelationship'] = 'SpecialAddRelationship';
 $wgSpecialPages['EditProfile'] = 'SpecialEditProfile';

-- 
To view, visit https://gerrit.wikimedia.org/r/325141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte 
Gerrit-Reviewer: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Initial Echo integration, based on ikasty's code

2016-12-03 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Initial Echo integration, based on ikasty's code
..


Initial Echo integration, based on ikasty's code

Original diff can be found at https://git.io/v1W5n
Some cleanup, (copypasted) "brand new" code, etc. by me.

The new notifications-*.svg images are from WikiFont:
* notifications-award.svg was originally named "uniE023 - ribbonPrize.svg"
* notifications-gift-sent.svg was originally named "uniE022 - upload.svg"
* notifications-gift-received.svg was originally named "uniE023 - download.svg"
* notifications-added.svg was originally named "uniE022 - check.svg"
* notifications-level-up.svg was originally named "uniE027 - betaLaunch.svg"
Some of them have had their color changed to green as per Echo design
guidelines by giving the  element a fill attribute.

Bug: T64520
Change-Id: I0c610c2bd33955c7f36619df9a3ce6b61b3c134f
---
M SocialProfile.php
A SystemGifts/EchoUserSystemGiftPresentationModel.php
M SystemGifts/SystemGifts.php
M SystemGifts/SystemGiftsClass.php
M SystemGifts/UserSystemGiftsClass.php
A SystemGifts/UserSystemGiftsHooks.php
M SystemGifts/i18n/en.json
M SystemGifts/i18n/fi.json
A UserBoard/EchoUserBoardMessagePresentationModel.php
M UserBoard/UserBoardClass.php
A UserBoard/UserBoardHooks.php
M UserBoard/i18n/en.json
M UserBoard/i18n/fi.json
A UserGifts/EchoUserGiftPresentationModel.php
M UserGifts/Gifts.php
M UserGifts/UserGiftsClass.php
A UserGifts/UserGiftsHooks.php
M UserGifts/i18n/en.json
M UserGifts/i18n/fi.json
M UserProfile/SpecialUpdateProfile.php
A UserRelationship/EchoUserRelationshipPresentationModel.php
M UserRelationship/UserRelationshipClass.php
A UserRelationship/UserRelationshipHooks.php
M UserRelationship/i18n/en.json
M UserRelationship/i18n/fi.json
A UserStats/EchoUserLevelAdvancePresentationModel.php
M UserStats/UserStatsClass.php
A UserStats/UserStatsHooks.php
M UserStats/i18n/en.json
M UserStats/i18n/fi.json
M UserSystemMessages/UserSystemMessagesClass.php
A images/notifications-added.svg
A images/notifications-award.svg
A images/notifications-gift-received.svg
A images/notifications-gift-sent.svg
A images/notifications-level-up.svg
36 files changed, 907 insertions(+), 19 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/SocialProfile.php b/SocialProfile.php
index f4b722a..c2b4098 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -121,7 +121,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',
'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
-   'version' => '1.9',
+   'version' => '1.10',
'url' => 'https://www.mediawiki.org/wiki/Extension:SocialProfile',
'descriptionmsg' => 'socialprofile-desc',
 );
diff --git a/SystemGifts/EchoUserSystemGiftPresentationModel.php 
b/SystemGifts/EchoUserSystemGiftPresentationModel.php
new file mode 100644
index 000..5e46807
--- /dev/null
+++ b/SystemGifts/EchoUserSystemGiftPresentationModel.php
@@ -0,0 +1,31 @@
+isBundled() ) {
+   return $this->msg( 
'notification-social-award-rec-bundle', $this->getBundleCount() );
+   } else {
+   return $this->msg( 'notification-social-award-rec', 
$this->event->getExtraParam( 'giftname' ) );
+   }
+   }
+
+   public function getBodyMessage() {
+   return false;
+   }
+
+   public function getPrimaryLink() {
+   return array(
+   'url' => SpecialPage::getTitleFor( 'ViewSystemGift' 
)->getLocalURL( array( 'gift_id' => $this->event->getExtraParam( 'giftid' ) ) ),
+   'label' => $this->msg( 'echo-learn-more' )->text()
+   );
+   }
+
+}
\ No newline at end of file
diff --git a/SystemGifts/SystemGifts.php b/SystemGifts/SystemGifts.php
index 06555f0..3d906e1 100644
--- a/SystemGifts/SystemGifts.php
+++ b/SystemGifts/SystemGifts.php
@@ -15,6 +15,7 @@
 
 $wgAutoloadClasses['SystemGifts'] = 
"{$wgSystemGiftsDirectory}/SystemGiftsClass.php";
 $wgAutoloadClasses['UserSystemGifts'] = 
"{$wgSystemGiftsDirectory}/UserSystemGiftsClass.php";
+$wgAutoloadClasses['UserSystemGiftsHooks'] = 
"{$wgSystemGiftsDirectory}/UserSystemGiftsHooks.php";
 
 // Special Pages
 $wgAutoloadClasses['TopAwards'] = "{$wgSystemGiftsDirectory}/TopAwards.php";
@@ -48,3 +49,13 @@
'remoteExtPath' => 'SocialProfile/SystemGifts',
'position' => 'top'
 );
+
+// Echo (Notifications) stuff
+$wgAutoloadClasses['EchoUserSystemGiftPresentationModel'] = 
"{$wgSystemGiftsDirectory}/EchoUserSystemGiftPresentationModel.php";
+
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserSystemGiftsHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserSystemGiftsHooks::onEchoGetDefaultNotifiedUsers';
+$wgHooks['EchoGetBundleRules'][] = 
'UserSystemGiftsHooks::onEchoGetBundleRules';
+

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: [WIP] Replacement of old AJAX stuff with API modules, based ...

2016-12-03 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325133

Change subject: [WIP] Replacement of old AJAX stuff with API modules, based on 
ikasty's code
..

[WIP] Replacement of old AJAX stuff with API modules, based on ikasty's code

Original diff can be found at
https://github.com/wiki-chan/Social/commit/bb932d15d36bcb4ee076bdcf0e8494496eb0906b
Some cleanup, (copypasted) "brand new" code, etc. by me.

* Renamed API modules to clearly mark them as such
** SendUserBoardMessage --> ApiSendUserBoardMessage
** RelationshipResponse --> ApiRelationshipResponse
* Also prefixed the API actions with socialprofile- instead of social-, for 
consistency
(unlike the Wiki-Chan fork, SocialProfile's canonical name is SocialProfile); 
i.e. socialprofile-send-message
instead of social-send-message for the UserBoard API module used to send out 
board messages
* Added new API module for deleting UserBoard messages 
(ApiDeleteUserBoardMessage)
* Made the API modules use $this->getUser() instead of the global $wgUser
* Translated various hard-coded Korean strings (via Google Translate) in the 
API modules to English

And random, not directly related changes nevertheless bundled here:
* Moved one hard-coded English string from UserProfilePage.js into the i18n file
** This is kinda shitty because technically it should be and actually *is*
already a UserBoard string (userboard_confirmdelete) and now it's
duplicated here as user-board-confirm-delete
* And also in UserProfilePage.js, got rid of an unnecessary variable (replaceID)

Change-Id: I91bb1b68c3a66f7af422435307085daa709a2156
---
M SocialProfile.php
A UserBoard/ApiDeleteUserBoardMessage.php
A UserBoard/ApiSendUserBoardMessage.php
M UserBoard/SpecialUserBoard.php
M UserBoard/UserBoard.js
D UserBoard/UserBoard_AjaxFunctions.php
M UserProfile/UserProfile.php
M UserProfile/UserProfilePage.js
M UserProfile/i18n/en.json
M UserProfile/i18n/fi.json
A UserRelationship/ApiRelationshipResponse.php
D UserRelationship/Relationship_AjaxFunctions.php
M UserRelationship/UserRelationship.js
13 files changed, 256 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/33/325133/1

diff --git a/SocialProfile.php b/SocialProfile.php
index 3cb910b..f4b722a 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -31,12 +31,12 @@
 $wgMessagesDirs['SocialProfileUserProfile'] = __DIR__ . '/UserProfile/i18n';
 $wgMessagesDirs['SocialProfileUserRelationship'] = __DIR__ . 
'/UserRelationship/i18n';
 $wgMessagesDirs['SocialProfileUserStats'] = __DIR__ . '/UserStats/i18n';
+
 $wgExtensionMessagesFiles['SocialProfileNamespaces'] = __DIR__ . 
'/SocialProfile.namespaces.php';
 $wgExtensionMessagesFiles['AvatarMagic'] = __DIR__ . 
'/UserProfile/Avatar.magic.i18n.php';
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
-
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
 $wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
@@ -67,9 +67,18 @@
 $wgAutoloadClasses['AvatarParserFunction'] = __DIR__ . 
'/UserProfile/AvatarParserFunction.php';
 $wgAutoloadClasses['SPUserSecurity'] = __DIR__ . 
'/UserSecurity/UserSecurityClass.php';
 
-// API module
+// API modules
 $wgAutoloadClasses['ApiUserProfilePrivacy'] = __DIR__ . 
'/UserProfile/ApiUserProfilePrivacy.php';
 $wgAPIModules['smpuserprivacy'] = 'ApiUserProfilePrivacy';
+
+$wgAutoloadClasses['ApiDeleteUserBoardMessage'] = __DIR__ . 
'/UserBoard/ApiDeleteUserBoardMessage.php';
+$wgAPIModules['socialprofile-delete-message'] = 'ApiDeleteUserBoardMessage';
+
+$wgAutoloadClasses['ApiSendUserBoardMessage'] = __DIR__ . 
'/UserBoard/ApiSendUserBoardMessage.php';
+$wgAPIModules['socialprofile-send-message'] = 'ApiSendUserBoardMessage';
+
+$wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
+$wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
 // New special pages
 $wgSpecialPages['AddRelationship'] = 'SpecialAddRelationship';
@@ -89,10 +98,6 @@
 $wgSpecialPages['UserBoard'] = 'SpecialViewUserBoard';
 $wgSpecialPages['ViewRelationshipRequests'] = 
'SpecialViewRelationshipRequests';
 $wgSpecialPages['ViewRelationships'] = 'SpecialViewRelationships';
-
-// Necessary AJAX functions
-require_once( 
"$IP/extensions/SocialProfile/UserBoard/UserBoard_AjaxFunctions.php" );
-require_once( 
"$IP/extensions/SocialProfile/UserRelationship/Relationship_AjaxFunctions.php" 
);
 
 // What to display on social profile pages by default?
 $wgUserProfileDisplay['board'] = true;
@@ -116,7 +121,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',

[MediaWiki-commits] [Gerrit] Fix heading levels in release notes - change (mediawiki/core)

2016-06-16 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294686

Change subject: Fix heading levels in release notes
..

Fix heading levels in release notes

Change-Id: I83e6922ba62e621588de7d592704c4e35c1bc6ef
---
M RELEASE-NOTES-1.26
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/294686/1

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index fd2e5e6..1df98e0 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -5,7 +5,7 @@
 
 This is a maintenance release of the MediaWiki 1.26 branch.
 
-== Changes since 1.26.2 ==
+=== Changes since 1.26.2 ===
 * (T116266) Fixed undefined property notices in DairikiDiff under HHVM.
 * (T123166) Fix fatal error when importing pages to titles which cannot be
   created, such as invalid titles or titles the user is not allowed to edit.
@@ -33,7 +33,7 @@
 
 This is a maintenance release of the MediaWiki 1.26 branch.
 
-== Changes since 1.26.1 ==
+=== Changes since 1.26.1 ===
 * (T121892) Fix fatal error on some Special pages, introduced in 1.26.1.
 
 == MediaWiki 1.26.1 ==

-- 
To view, visit https://gerrit.wikimedia.org/r/294686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83e6922ba62e621588de7d592704c4e35c1bc6ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Lewis Cawte 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't quote assert expressions in DairikiDiff - change (mediawiki/core)

2016-06-16 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294681

Change subject: Don't quote assert expressions in DairikiDiff
..

Don't quote assert expressions in DairikiDiff

Per HHVM issue 5128, it is not possible to use '$this' in string-literal
assert() expressions. We can either wait for this to be fixed (unlikely to
happen soon, since it involves deep interpreter internals), comment out or
remove the asserts, or simply unquote them, so that they are actual expressions
rather than strings. The downside to this is that assertions will always be
evaluated (but so what, they are extremely cheap), and that when an assertion
fail the error message will simply read 'assert(): Assertion failed in
/path/to/file on line XXX' as opposed to including the expression in the
output. Fair trade, IMO.

See: https://github.com/facebook/hhvm/issues/5128

Bug: T124163
Change-Id: Ib458b1b0c28f8d38e9df427196ae79814f6dc0c2
(cherry picked from commit 9e867b07b8cc42370c358fc0b25679920ceb8e62)
---
M includes/diff/DairikiDiff.php
1 file changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/81/294681/1

diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
index 7bdc654..ef75a7a 100644
--- a/includes/diff/DairikiDiff.php
+++ b/includes/diff/DairikiDiff.php
@@ -237,8 +237,8 @@
$edits = array();
$xi = $yi = 0;
while ( $xi < $n_from || $yi < $n_to ) {
-   assert( '$yi < $n_to || $this->xchanged[$xi]' );
-   assert( '$xi < $n_from || $this->ychanged[$yi]' );
+   assert( $yi < $n_to || $this->xchanged[$xi] );
+   assert( $xi < $n_from || $this->ychanged[$yi] );
 
// Skip matching "snake".
$copy = array();
@@ -434,7 +434,7 @@
while ( list( , $y ) = each( $matches ) ) {
if ( empty( $this->in_seq[$y] ) ) {
$k = $this->lcsPos( $y );
-   assert( '$k > 0' );
+   assert( $k > 0 );
$ymids[$k] = $ymids[$k - 1];
break;
}
@@ -442,7 +442,7 @@
 
while ( list( , $y ) = each( $matches ) ) {
if ( $y > $this->seq[$k - 1] ) {
-   assert( '$y < $this->seq[$k]' );
+   assert( $y < $this->seq[$k] );
// Optimization: this is a 
common case:
//  next match is just 
replacing previous match.
$this->in_seq[$this->seq[$k]] = 
false;
@@ -450,7 +450,7 @@
$this->in_seq[$y] = 1;
} elseif ( empty( $this->in_seq[$y] ) ) 
{
$k = $this->lcsPos( $y );
-   assert( '$k > 0' );
+   assert( $k > 0 );
$ymids[$k] = $ymids[$k - 1];
}
}
@@ -493,7 +493,7 @@
}
}
 
-   assert( '$ypos != $this->seq[$end]' );
+   assert( $ypos != $this->seq[$end] );
 
$this->in_seq[$this->seq[$end]] = false;
$this->seq[$end] = $ypos;
@@ -581,7 +581,7 @@
$i = 0;
$j = 0;
 
-   assert( 'count($lines) == count($changed)' );
+   assert( count( $lines ) == count( $changed ) );
$len = count( $lines );
$other_len = count( $other_changed );
 
@@ -602,7 +602,7 @@
}
 
while ( $i < $len && !$changed[$i] ) {
-   assert( '$j < $other_len && ! 
$other_changed[$j]' );
+   assert( $j < $other_len && ! $other_changed[$j] 
);
$i++;
$j++;
while ( $j < $other_len && $other_changed[$j] ) 
{
@@ -639,11 +639,11 @@
while ( $start > 0 && $changed[$start - 
1] ) {
$start--;
}
-   assert( '$j > 0' );
+   assert( $j > 0 );

[MediaWiki-commits] [Gerrit] Bump version - change (mediawiki...BlogPage)

2015-10-15 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Bump version
..


Bump version

Change-Id: Idb7f3ae61b1c2de1d46bfaa95e416ab6ccd351b8
---
M BlogPage.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Lewis Cawte: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/BlogPage.php b/BlogPage.php
index 0fcc811..5e2c898 100644
--- a/BlogPage.php
+++ b/BlogPage.php
@@ -15,7 +15,7 @@
 // Extension credits that will show up on Special:Version
 $wgExtensionCredits['other'][] = array(
'name' => 'BlogPage',
-   'version' => '2.3.2',
+   'version' => '2.4.0',
'author' => array( 'David Pean', 'Jack Phoenix' ),
'descriptionmsg' => 'blogpage-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:BlogPage',
diff --git a/extension.json b/extension.json
index 07a7f04..697ff5b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlogPage",
-   "version": "2.3.2",
+   "version": "2.4.0",
"author": [
"David Pean",
"Jack Phoenix"

-- 
To view, visit https://gerrit.wikimedia.org/r/244944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb7f3ae61b1c2de1d46bfaa95e416ab6ccd351b8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rename files to fit coding convention. - change (mediawiki...BlogPage)

2015-10-10 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/244938

Change subject: Rename files to fit coding convention.
..

Rename files to fit coding convention.

Change-Id: I7902f98306111748882dbd911dbbfd860472893b
---
D Blog.php
R BlogPage.alias.php
A BlogPage.class.php
R BlogPage.hooks.php
R BlogPage.namespaces.php
M BlogPage.php
A extension.json
7 files changed, 1,488 insertions(+), 1,374 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage 
refs/changes/38/244938/1

diff --git a/Blog.php b/Blog.php
deleted file mode 100644
index 6d262f2..000
--- a/Blog.php
+++ /dev/null
@@ -1,146 +0,0 @@
-
- * @author Jack Phoenix 
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link https://www.mediawiki.org/wiki/Extension:BlogPage Documentation
- */
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'name' => 'BlogPage',
-   'version' => '2.3.2',
-   'author' => array( 'David Pean', 'Jack Phoenix' ),
-   'descriptionmsg' => 'blogpage-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:BlogPage',
-);
-
-// Define the namespace constants
-define( 'NS_BLOG', 500 );
-define( 'NS_BLOG_TALK', 501 );
-
-// ResourceLoader support for MediaWiki 1.17+
-
-// Main module, used on *all* blog pages (see the hooks file)
-$wgResourceModules['ext.blogPage'] = array(
-   'styles' => 'resources/css/BlogPage.css',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'BlogPage',
-   'position' => 'top'
-);
-
-// Used on Special:ArticlesHome & Special:ArticleLists
-$wgResourceModules['ext.blogPage.articlesHome'] = array(
-   'styles' => 'resources/css/ArticlesHome.css',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'BlogPage',
-   'position' => 'top'
-);
-
-// Used on Special:CreateBlogPost
-$wgResourceModules['ext.blogPage.create.css'] = array(
-   'styles' => 'resources/css/CreateBlogPost.css',
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'BlogPage',
-   'position' => 'top'
-);
-
-$wgResourceModules['ext.blogPage.create.js'] = array(
-   'scripts' => 'resources/js/CreateBlogPost.js',
-   // 'dependencies' => 'mediawiki.action.edit',
-   'messages' => array(
-   'blog-js-create-error-need-content', 
'blog-js-create-error-need-title',
-   'blog-js-create-error-page-exists'
-   ),
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'BlogPage',
-);
-
-// Default setup for displaying sections
-$wgBlogPageDisplay = array(
-   // Output the left-hand column? This column contains the list of 
authors,
-   // recent editors (if enabled), recent voters (if enabled), embed widget
-   // (if enabled) and left-side advertisement (if enabled).
-   'leftcolumn' => true,
-   // Output the right-hand column? This column contains the list of 
popular
-   // blog articles (if enabled), in the news section (if enabled), 
comments
-   // of the day (if enabled), a random casual game (if enabled) and a 
list of
-   // new blog articles.
-   'rightcolumn' => true,
-   // Display the box that contains some information about the author of 
the
-   // blog post?
-   'author' => true,
-   // Display some (three, to be exact) other blog articles written by the
-   // same user?
-   'author_articles' => true,
-   // Display a list of people (complete with their avatars) who recently
-   // edited this blog post?
-   'recent_editors' => true,
-   // Display a list of people (complete with their avatars) who recently
-   // voted for this blog post?
-   'recent_voters' => true,
-   // Show an advertisement in the left-hand column?
-   'left_ad' => false,
-   // Show a listing of the most popular blog posts?
-   'popular_articles' => true,
-   // Should we display some random news items from 
[[MediaWiki:Inthenews]]?
-   'in_the_news' => true,
-   // Show comments of the day (comments with the most votes) in the 
sidebar
-   // on a blog post page?
-   'comments_of_day' => true,
-   // Display a random casual game (picture game, poll or quiz)?
-   // Requires the RandomGameUnit extension.
-   'games' => true,
-   // Show a listing of the newest blog posts in blog pages?
-   'new_articles' => true,
-   // Display the widget that allows you to embed the blog post on another
-   // site? Off by default since it requires the ContentWidget extension,
-   // which is currently ArmchairGM-specific.
-   'embed_widget' => false
-);
-
-// Set up everything
-$wgMessagesDirs['Blog'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['BlogAlias'] = __DIR__ . '/Blog.alias.php';
-// Namespace translations

[MediaWiki-commits] [Gerrit] Rename class to avoid breaking lots of class calls - change (mediawiki...BlogPage)

2015-10-10 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/244939

Change subject: Rename class to avoid breaking lots of class calls
..

Rename class to avoid breaking lots of class calls

Change-Id: I2c873adf93e69a528be388cf961e9ed81bf51aa6
---
M BlogPage.php
M BlogPageClass.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage 
refs/changes/39/244939/1

diff --git a/BlogPage.php b/BlogPage.php
index e75db44..0fcc811 100644
--- a/BlogPage.php
+++ b/BlogPage.php
@@ -110,7 +110,7 @@
 $wgExtensionMessagesFiles['BlogPageNamespaces'] = __DIR__ . 
'/BlogPage.namespaces.php';
 
 // Autoload the class which is used when rendering pages in the NS_BLOG NS
-$wgAutoloadClasses['BlogPageClass'] = __DIR__ . '/BlogPageClass.php';
+$wgAutoloadClasses['BlogPage'] = __DIR__ . '/BlogPageClass.php';
 
 // Special pages
 $wgAutoloadClasses['ArticlesHome'] = __DIR__ . '/SpecialArticlesHome.php';
diff --git a/BlogPageClass.php b/BlogPageClass.php
index 20d1aae..216bfb0 100644
--- a/BlogPageClass.php
+++ b/BlogPageClass.php
@@ -4,7 +4,7 @@
  *
  * @file
  */
-class BlogPageClass extends Article {
+class BlogPage extends Article {
 
public $title = null;
public $authors = array();

-- 
To view, visit https://gerrit.wikimedia.org/r/244939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c873adf93e69a528be388cf961e9ed81bf51aa6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make Special:ConfirmEmail load the user from the master - change (mediawiki/core)

2015-08-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/233109

Change subject: Make Special:ConfirmEmail load the user from the master
..

Make Special:ConfirmEmail load the user from the master

* This can help guard against stale reads if the user was
  created or changed a second ago.

Bug: T105896
Change-Id: Ib2a59762cd8f4a4b7ad86d0700f186bee1d5b2d1
(cherry picked from commit 3f24d1e348f23f331ad0a85d2e83876830e83df6)
---
M includes/User.php
M includes/specials/SpecialConfirmemail.php
2 files changed, 18 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/233109/1

diff --git a/includes/User.php b/includes/User.php
index 8ea491c..663a80b 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -526,19 +526,24 @@
 * If the code is invalid or has expired, returns NULL.
 *
 * @param string $code Confirmation code
+* @param int $flags User::READ_* bitfield
 * @return User|null
 */
-   public static function newFromConfirmationCode( $code ) {
-   $dbr = wfGetDB( DB_SLAVE );
-   $id = $dbr-selectField( 'user', 'user_id', array(
-   'user_email_token' = md5( $code ),
-   'user_email_token_expires  ' . $dbr-addQuotes( 
$dbr-timestamp() ),
-   ) );
-   if ( $id !== false ) {
-   return User::newFromId( $id );
-   } else {
-   return null;
-   }
+   public static function newFromConfirmationCode( $code, $flags = 0 ) {
+   $db = ( $flags  self::READ_LATEST ) == self::READ_LATEST
+   ? wfGetDB( DB_MASTER )
+   : wfGetDB( DB_SLAVE );
+
+   $id = $db-selectField(
+   'user',
+   'user_id',
+   array(
+   'user_email_token' = md5( $code ),
+   'user_email_token_expires  ' . $db-addQuotes( 
$db-timestamp() ),
+   )
+   );
+
+   return $id ? User::newFromId( $id ) : null;
}
 
/**
diff --git a/includes/specials/SpecialConfirmemail.php 
b/includes/specials/SpecialConfirmemail.php
index b6ab112..6356155 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -120,7 +120,7 @@
 * @param string $code Confirmation code
 */
function attemptConfirm( $code ) {
-   $user = User::newFromConfirmationCode( $code );
+   $user = User::newFromConfirmationCode( $code, User::READ_LATEST 
);
if ( !is_object( $user ) ) {
$this-getOutput()-addWikiMsg( 'confirmemail_invalid' 
);
 
@@ -164,7 +164,7 @@
 * @param string $code Confirmation code
 */
function attemptInvalidate( $code ) {
-   $user = User::newFromConfirmationCode( $code );
+   $user = User::newFromConfirmationCode( $code, User::READ_LATEST 
);
if ( !is_object( $user ) ) {
$this-getOutput()-addWikiMsg( 'confirmemail_invalid' 
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/233109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a59762cd8f4a4b7ad86d0700f186bee1d5b2d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix variable name and use isset() to shut up a stupid notice - change (mediawiki/core)

2015-06-19 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219445

Change subject: Fix variable name and use isset() to shut up a stupid notice
..

Fix variable name and use isset() to shut up a stupid notice

We've had to reapply this small core hack on ShoutWiki basically after
each core upgrade since MW 1.23 (at least).

ShoutWiki SVN r2565, r2819

Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175
(cherry picked from commit 01504ab3417fb05806892ac50748bd623868d1ee)
---
M includes/specials/SpecialVersion.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/219445/1

diff --git a/includes/specials/SpecialVersion.php 
b/includes/specials/SpecialVersion.php
index c1a9593..9a1c5e5 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -265,8 +265,8 @@
$version = $wgVersion . ' ' .
wfMessage(
'version-svn-revision',
-   isset( $info['directory-rev'] ) ? 
$info['directory-rev'] : '',
-   $info['checkout-rev']
+   isset( $svnInfo['directory-rev'] ) ? 
$svnInfo['directory-rev'] : '',
+   isset( $svnInfo['checkout-rev'] ) ? 
$svnInfo['checkout-rev'] : ''
)-text();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/219445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I815efe0a3c66b145a2c429549cf139ed3c67d175
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix version number and headers in release notes - change (mediawiki/core)

2015-06-19 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219460

Change subject: Fix version number and headers in release notes
..

Fix version number and headers in release notes

Change-Id: I38d9bd1cb54463613e761989cadbaa5a09f6f3bc
---
M RELEASE-NOTES-1.25
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/219460/1

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 6746224..95efd02 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -5,7 +5,7 @@
 
 THIS IS NOT YET A RELEASE!
 
-== Changes since 1.25.2 ==
+=== Changes since 1.25.1 ===
 
 * (T100767) Setting a configuration setting for skin or extension to
   false in LocalSettings.php was not working.
@@ -15,6 +15,10 @@
   a manifest_version property for 1.26 compatability will no longer
   trigger warnings.
 
+== MediaWiki 1.25.1 ==
+
+This is a maintenance release of the MediaWiki 1.25 branch.
+
 === Changes since 1.25 ===
 * (T100351) Fix syntax errors in extension.json of ConfirmEdit extension
 

-- 
To view, visit https://gerrit.wikimedia.org/r/219460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38d9bd1cb54463613e761989cadbaa5a09f6f3bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add page_restrictions to readlock in lockSearchindex - change (mediawiki/core)

2015-06-19 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219491

Change subject: Add page_restrictions to readlock in lockSearchindex
..

Add page_restrictions to readlock in lockSearchindex

Bug: T86156
Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
(cherry picked from commit f50de5d93d8128784735954ed9eccf6f84a1b347)
---
M maintenance/Maintenance.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/219491/1

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 923c5b4..5dafdfc 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1097,7 +1097,7 @@
 */
private function lockSearchindex( $db ) {
$write = array( 'searchindex' );
-   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user' );
+   $read = array( 'page', 'revision', 'text', 'interwiki', 
'l10n_cache', 'user', 'page_restrictions' );
$db-lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/219491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie003dd279e2b157a628e415e39f231d5cb1ab468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] FancyCaptcha: callbacks can't be arrays - change (mediawiki...ConfirmEdit)

2015-06-19 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219414

Change subject: FancyCaptcha: callbacks can't be arrays
..

FancyCaptcha: callbacks can't be arrays

Bug: T100561
Change-Id: I22353669a85391c3d9760a5253cac1263e895cf9
(cherry picked from commit 86b0aa3d374450c78d2e8ad817c043ffe5c380da)
---
M FancyCaptcha/extension.json
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/14/219414/1

diff --git a/FancyCaptcha/extension.json b/FancyCaptcha/extension.json
index 11b877b..dba07d9 100644
--- a/FancyCaptcha/extension.json
+++ b/FancyCaptcha/extension.json
@@ -38,9 +38,7 @@
localBasePath: resources,
remoteExtPath: ConfirmEdit/FancyCaptcha/resources
},
-   callback: [
-   ConfirmEditHooks::onFancyCaptchaSetup
-   ],
+   callback: ConfirmEditHooks::onFancyCaptchaSetup,
config: {
CaptchaClass: FancyCaptcha,
CaptchaFileBackend: ,

-- 
To view, visit https://gerrit.wikimedia.org/r/219414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22353669a85391c3d9760a5253cac1263e895cf9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: REL1_25
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Modify access rules - change (mediawiki...AjaxLogin)

2015-06-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/216703

Change subject: Modify access rules
..

Modify access rules
---
M groups
M project.config
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AjaxLogin 
refs/changes/03/216703/1

diff --git a/groups b/groups
index 19b74a8..d1c434f 100644
--- a/groups
+++ b/groups
@@ -1,3 +1,4 @@
 # UUID Group Name
 #
 e77706137eea78b0efd8d464bfd31d511b46f8e8   extension-AjaxLogin
+e840de91aa21e5e32768f44e776c43d4fc1ca729   ShoutWiki
diff --git a/project.config b/project.config
index a076321..8423711 100644
--- a/project.config
+++ b/project.config
@@ -7,4 +7,5 @@
 [submit]
mergeContent = true
 [access refs/*]
+   owner = group ShoutWiki
owner = group extension-AjaxLogin

-- 
To view, visit https://gerrit.wikimedia.org/r/216703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b0596f28aa8a7f928a79d08fd31d5b767bd6b17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AjaxLogin
Gerrit-Branch: refs/meta/config
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Convert to extension registration - change (mediawiki...AJAXPoll)

2015-05-31 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/214985

Change subject: Convert to extension registration
..

Convert to extension registration

Change-Id: I3330d28cee9f9c0075672b48dd8fa63a2a799c4c
---
A extension.json
1 file changed, 72 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll 
refs/changes/85/214985/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..d260ca9
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,72 @@
+{
+   name: AJAX Poll,
+   version: 1.88.0 20140330,
+   author: [
+   Dariusz Siedlecki,
+   Jack Phoenix,
+   Thomas Gries
+   ],
+   url: https://www.mediawiki.org/wiki/Extension:AJAX_Poll;,
+   descriptionmsg: ajaxpoll-desc,
+   type: parserhook,
+   GroupPermissions: {
+   *: {
+   ajaxpoll-vote: false,
+   ajaxpoll-view-results: false,
+   ajaxpoll-view-results-before-vote: false
+   },
+   user: {
+   ajaxpoll-vote: true,
+   ajaxpoll-view-results: true
+   }
+   },
+   AvailableRights: [
+   ajaxpoll-vote,
+   ajaxpoll-view-results,
+   ajaxpoll-view-results-before-vote
+   ],
+   MessagesDirs: {
+   AJAXPoll: [
+   i18n
+   ]
+   },
+   AutoloadClasses: {
+   AJAXPoll: AJAXPoll_body.php
+   },
+   ResourceModules: {
+   ext.ajaxpoll: {
+   group: ext.ajaxpoll,
+   scripts: [
+   ajaxpoll.js
+   ],
+   styles: [
+   ajaxpoll.css
+   ],
+   dependencies: [],
+   messages: [
+   ajaxpoll-submitting
+   ]
+   }
+   },
+   ResourceFileModulePaths: {
+   localBasePath: resources,
+   remoteExtPath: AJAXPoll/resources
+   },
+   Hooks: {
+   ParserFirstCallInit: [
+   AJAXPoll::onParserInit
+   ],
+   LoadExtensionSchemaUpdates: [
+   AJAXPoll::onLoadExtensionSchemaUpdates
+   ]
+   },
+   config: {
+   AjaxExportList: [
+   AJAXPoll::submitVote
+   ],
+   TrackingCategories: [
+   ajaxpoll-tracking-category
+   ]
+   },
+   manifest_version: 1
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/214985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3330d28cee9f9c0075672b48dd8fa63a2a799c4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Convert to extension registration - change (mediawiki...Comments)

2015-05-31 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/214986

Change subject: Convert to extension registration
..

Convert to extension registration

Change-Id: I948acbb974903be86fbe46477ac6f3a37c4e4f45
---
A extension.json
1 file changed, 121 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Comments 
refs/changes/86/214986/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..2500dce
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,121 @@
+{
+   name: Comments,
+   version: 4.1.0,
+   author: [
+   David Pean,
+   Misza,
+   Jack Phoenix,
+   Adam Carter/UltrasonicNXT
+   ],
+   url: https://www.mediawiki.org/wiki/Extension:Comments;,
+   descriptionmsg: comments-desc,
+   type: parserhook,
+   GroupPermissions: {
+   *: {
+   comment: true
+   },
+   commentadmin: {
+   commentadmin: true
+   },
+   autoconfirmed: {
+   commentlinks: true
+   }
+   },
+   AvailableRights: [
+   comment,
+   commentadmin,
+   commentlinks
+   ],
+   SpecialPages: {
+   CommentIgnoreList: CommentIgnoreList
+   },
+   LogTypes: [
+   comments
+   ],
+   FilterLogTypes: {
+   comments: true
+   },
+   LogActionsHandlers: {
+   comments/add: CommentsLogFormatter,
+   comments/delete: LogFormatter
+   },
+   APIModules: {
+   commentblock: CommentBlockAPI,
+   commentdelete: CommentDeleteAPI,
+   commentlatestid: CommentLatestIdAPI,
+   commentlist: CommentListAPI,
+   commentsubmit: CommentSubmitAPI,
+   commentvote: CommentVoteAPI
+   },
+   MessagesDirs: {
+   Comments: [
+   i18n
+   ]
+   },
+   ExtensionMessagesFiles: {
+   CommentsMagic: Comments.i18n.magic.php,
+   NumberOfCommentsMagic: Comments.i18n.magic.php
+   },
+   AutoloadClasses: {
+   Comment: CommentClass.php,
+   CommentsPage: CommentsPage.php,
+   CommentFunctions: CommentFunctions.php,
+   CommentIgnoreList: SpecialCommentIgnoreList.php,
+   CommentsLogFormatter: CommentsLogFormatter.php,
+   CommentsHooks: CommentsHooks.php,
+   NumberOfComments: NumberOfComments.php,
+   CommentBlockAPI: api/CommentBlock.api.php,
+   CommentDeleteAPI: api/CommentDelete.api.php,
+   CommentLatestIdAPI: api/CommentLatestID.api.php,
+   CommentListAPI: api/CommentList.api.php,
+   CommentSubmitAPI: api/CommentSubmit.api.php,
+   CommentVoteAPI: api/CommentVote.api.php
+   },
+   ResourceModules: {
+   ext.comments.css: {
+   styles: Comments.css,
+   position: top
+   },
+   ext.comments.js: {
+   scripts: Comment.js,
+   messages: [
+   comments-voted-label,
+   comments-loading,
+   comments-auto-refresher-pause,
+   comments-auto-refresher-enable,
+   comments-cancel-reply,
+   comments-reply-to,
+   comments-block-warning-anon,
+   comments-block-warning-user,
+   comments-delete-warning
+   ]
+   }
+   },
+   ResourceFileModulePaths: {
+   localBasePath: ,
+   remoteExtPath: Comments
+   },
+   Hooks: {
+   ParserFirstCallInit: [
+   CommentsHooks::onParserFirstCallInit,
+   NumberOfComments::setupNumberOfCommentsPageParser
+   ],
+   LoadExtensionSchemaUpdates: [
+   CommentsHooks::onLoadExtensionSchemaUpdates
+   ],
+   RenameUserSQL: [
+   CommentsHooks::onRenameUserSQL
+   ],
+   MagicWordwgVariableIDs: [
+   NumberOfComments::registerNumberOfCommentsMagicWord
+   ],
+   ParserGetVariableValueSwitch: [
+   NumberOfComments::getNumberOfCommentsMagic
+   ]
+   },
+   config: {
+   CommentsDefaultAvatar: 
http://www.shoutwiki.com/w/extensions/SocialProfile/avatars/default_ml.gif;,
+   CommentsSortDescending: false,
+

[MediaWiki-commits] [Gerrit] Follow up d0fa3924, fix reverted fix. - change (mediawiki...WhosOnline)

2015-05-31 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/214918

Change subject: Follow up d0fa3924, fix reverted fix.
..

Follow up d0fa3924, fix reverted fix.

Change-Id: I463e87ac9299e8f6e797cc3c48d8b2e42a29a202
---
M WhosOnlineSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WhosOnline 
refs/changes/18/214918/1

diff --git a/WhosOnlineSpecialPage.php b/WhosOnlineSpecialPage.php
index 20e933e..423e962 100644
--- a/WhosOnlineSpecialPage.php
+++ b/WhosOnlineSpecialPage.php
@@ -77,7 +77,7 @@
global $wgContLang;
 
return $this-getLanguage()-viewPrevNext(
-   Title::newFromText( $wgContLang-specialpage( 
'WhosOnline' ) ),
+   SpecialPage::getTitleFor( 'WhosOnline' ),
$this-mOffset,
$this-mLimit,
array(),

-- 
To view, visit https://gerrit.wikimedia.org/r/214918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I463e87ac9299e8f6e797cc3c48d8b2e42a29a202
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhosOnline
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix typo in help message - change (mediawiki...release)

2015-05-25 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213481

Change subject: Fix typo in help message
..

Fix typo in help message

Change-Id: I26cfb049e9eb1fd343b18b21fd4dde4a866019e5
---
M make-release/make-release.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/81/213481/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index 5ad00e8..5739612 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -116,7 +116,7 @@
 parser.add_argument(
 '--list-bundled', dest='list_bundled',
 action='store_true',
-help='List all bundled extensions for the given versoin and quit'
+help='List all bundled extensions for the given version and quit'
 )
 
 return parser.parse_args()

-- 
To view, visit https://gerrit.wikimedia.org/r/213481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26cfb049e9eb1fd343b18b21fd4dde4a866019e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Convert to extension registration - change (mediawiki...EditAccount)

2015-05-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213298

Change subject: Convert to extension registration
..

Convert to extension registration

Change-Id: I2ec61fb84fd6bf18a999aa9a13988f3fe5cb1f82
---
A extension.json
1 file changed, 45 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditAccount 
refs/changes/98/213298/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..084e06e
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,45 @@
+{
+   name: EditAccount,
+   version: 1.3.1,
+   author: [
+   Łukasz Garczewski,
+   Jack Phoenix
+   ],
+   url: https://www.mediawiki.org/wiki/Extension:EditAccount;,
+   descriptionmsg: editaccount-desc,
+   type: specialpage,
+   GroupPermissions: {
+   *: {
+   editaccount: false
+   },
+   staff: {
+   editaccount: true
+   }
+   },
+   AvailableRights: [
+   editaccount
+   ],
+   SpecialPages: {
+   EditAccount: EditAccount
+   },
+   LogTypes: [
+   editaccnt
+   ],
+   LogRestrictions: {
+   editaccnt: editaccount
+   },
+   LogActionsHandlers: {
+   editaccnt/*: LogFormatter
+   },
+   MessagesDirs: {
+   EditAccount: [
+   i18n
+   ]
+   },
+   ExtensionMessagesFiles: {
+   EditAccountAliases: EditAccount.alias.php
+   },
+   AutoloadClasses: {
+   EditAccount: SpecialEditAccount_body.php
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/213298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ec61fb84fd6bf18a999aa9a13988f3fe5cb1f82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditAccount
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Convert to use extension(/skin) registration - change (mediawiki...Nimbus)

2015-05-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213212

Change subject: Convert to use extension(/skin) registration
..

Convert to use extension(/skin) registration

Change-Id: I860c21fdd90a1108381835ec2e540c9caec75086
---
A skin.json
1 file changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus 
refs/changes/12/213212/1

diff --git a/skin.json b/skin.json
new file mode 100644
index 000..77ba57c
--- /dev/null
+++ b/skin.json
@@ -0,0 +1,35 @@
+{
+   name: Nimbus,
+   version: 3.0,
+   author: [
+   Aaron Wright,
+   David Pean,
+   Inez Korczyński,
+   Jack Phoenix
+   ],
+   url: https://www.mediawiki.org/wiki/Skin:Nimbus;,
+   descriptionmsg: nimbus-desc,
+   type: skin,
+   ValidSkinNames: {
+   nimbus: Nimbus
+   },
+   MessagesDirs: {
+   MonoBook: [
+   i18n
+   ]
+   },
+   AutoloadClasses: {
+   SkinNimbus: Nimbus.skin.php
+   },
+   ResourceModules: {
+   skins.nimbus: {
+   styles: {
+   skins/Nimbus/nimbus/Nimbus.css: {
+   media: screen
+   }
+   },
+   scripts: skins/Nimbus/nimbus/Menu.js,
+   position: top
+   }
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/213212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I860c21fdd90a1108381835ec2e540c9caec75086
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Convert to extension registration - change (mediawiki...SearchExtraNS)

2015-05-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213323

Change subject: Convert to extension registration
..

Convert to extension registration

Bug: T87971
Change-Id: I0747c822bfabef7b3acdad44e1bbf13a79daa427
---
A SearchExtraNS.class.php
D SearchExtraNS.i18n.php
M SearchExtraNS.php
A extension.json
4 files changed, 64 insertions(+), 79 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SearchExtraNS 
refs/changes/23/213323/1

diff --git a/SearchExtraNS.class.php b/SearchExtraNS.class.php
new file mode 100644
index 000..24a2d39
--- /dev/null
+++ b/SearchExtraNS.class.php
@@ -0,0 +1,26 @@
+?php
+
+class SearchExtraNS {
+
+   /**
+   * @param $term string
+   * @param $title Title
+   * @return bool
+   */
+   public static function NearMatch( $term, $title ) {
+   global $wgSearchExtraNamespaces;
+
+   if( !is_array( $wgSearchExtraNamespaces ) ){
+   return true;
+   }
+
+   foreach( $wgSearchExtraNamespaces as $ens ) {
+   $title = Title::newFromText( $term, $ens );
+   if ( $title  $title-exists() ) {
+   return false;
+   }
+   }
+
+   return true;
+   }
+}
diff --git a/SearchExtraNS.i18n.php b/SearchExtraNS.i18n.php
deleted file mode 100644
index 6b28ec4..000
--- a/SearchExtraNS.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * 
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim43f591a5a1d09dbb' ) ) {
-   function wfJsonI18nShim43f591a5a1d09dbb( $cache, $code, $cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim43f591a5a1d09dbb';
-}
diff --git a/SearchExtraNS.php b/SearchExtraNS.php
index cd85906..854ccf0 100644
--- a/SearchExtraNS.php
+++ b/SearchExtraNS.php
@@ -1,45 +1,13 @@
 ?php
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( 'This file is a MediaWiki extension, it is not a valid entry 
point' );
-}
-
-$wgExtensionCredits['parserhook'][] = array(
-   'path' = __FILE__,
-   'name' = 'SearchExtraNS',
-   'url' = 'https://www.mediawiki.org/wiki/Extension:SearchExtraNS',
-   'descriptionmsg' = 'searchextrans-desc',
-   'author' = array( 'Roland Unger', 'Hans Musil' ),
-);
-
-$wgMessagesDirs['SearchExtraNS'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['SearchExtraNS'] = __DIR__ . 
'/SearchExtraNS.i18n.php';
-
-$wgSearchExtraNamespaces = false;
-
-class SearchExtraNS {
-
-   /**
-* @param $term string
-* @param $title Title
-* @return bool
-*/
-   public static function NearMatch( $term, $title ) {
-   global $wgSearchExtraNamespaces;
-
-   if( !is_array( $wgSearchExtraNamespaces ) ){
-   return true;
-   }
-
-   foreach( $wgSearchExtraNamespaces as $ens ) {
-   $title = Title::newFromText( $term, $ens );
-   if ( $title  $title-exists() ) {
-   return false;
-   }
-   }
-
-   return true;
-   }
-}
-
-$wgHooks['SearchAfterNoDirectMatch'][] = 'SearchExtraNS::NearMatch';
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'SearchExtraNS' );
+   // Keep i18n

[MediaWiki-commits] [Gerrit] Convert to extension registration - change (mediawiki...UserMerge)

2015-05-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213307

Change subject: Convert to extension registration
..

Convert to extension registration

Bug: T87989
Change-Id: I08c992458964b0e54f82d0cc46e7632037510ddf
---
A extension.json
1 file changed, 59 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge 
refs/changes/07/213307/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..fdd2538
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,59 @@
+{
+   name: UserMerge,
+   version: 1.9.0,
+   author: [
+   Tim Laqua,
+   Thomas Gries,
+   Matthew April
+   ],
+   url: https://www.mediawiki.org/wiki/Extension:UserMerge;,
+   descriptionmsg: usermerge-desc,
+   license-name: GPL-2.0+,
+   type: specialpage,
+   AvailableRights: [
+   usermerge
+   ],
+   SpecialPages: {
+   UserMerge: UserMerge
+   },
+   LogTypes: [
+   usermerge
+   ],
+   LogNames: {
+   usermerge: usermerge-logpage
+   },
+   LogHeaders: {
+   usermerge: usermerge-logpagetext
+   },
+   LogActions: {
+   usermerge/mergeuser: usermerge-success-log,
+   usermerge/deleteuser: usermerge-userdeleted-log
+   },
+   MessagesDirs: {
+   UserMerge: [
+   i18n
+   ]
+   },
+   ExtensionMessagesFiles: {
+   UserMergeAlias: UserMerge.alias.php
+   },
+   AutoloadClasses: {
+   SpecialUserMerge: SpecialUserMerge.php,
+   UserMerge: SpecialUserMerge.php,
+   MergeUser: MergeUser.php,
+   IUserMergeLogger: IUserMergeLogger.php,
+   UserMergeLogger: UserMergeLogger.php,
+   UserMergeHooks: UserMerge.hooks.php
+   },
+   Hooks: {
+   UnitTestsList: [
+   UserMergeHooks::onUnitTestsList
+   ]
+   },
+   config: {
+   UserMergeEnableDelete: true,
+   UserMergeProtectedGroups: [
+   sysop
+   ]
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/213307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08c992458964b0e54f82d0cc46e7632037510ddf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Convert to extension registration. - change (mediawiki...TorBlock)

2015-05-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/213314

Change subject: Convert to extension registration.
..

Convert to extension registration.

Bug: T87984
Change-Id: I12303c00445fc761b467371ace2646982d9a61e5
---
M TorBlock.php
A extension.json
2 files changed, 95 insertions(+), 125 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TorBlock 
refs/changes/14/213314/1

diff --git a/TorBlock.php b/TorBlock.php
index baf46b1..bbb1200 100644
--- a/TorBlock.php
+++ b/TorBlock.php
@@ -1,126 +1,13 @@
 ?php
-
-/**
- * Prevents Tor exit nodes from editing a wiki.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Extensions
- * @link http://www.mediawiki.org/wiki/Extension:TorBlock Documentation
- *
- * @author Andrew Garrett and...@epstone.net
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die();
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path'   = __FILE__,
-   'name'   = 'TorBlock',
-   'author' = 'Andrew Garrett',
-   'descriptionmsg' = 'torblock-desc',
-   'url'= 'https://www.mediawiki.org/wiki/Extension:TorBlock',
-   'license-name'   = 'GPL-2.0+',
-);
-
-$wgMessagesDirs['TorBlock'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['TorBlock'] =  __DIR__ . /TorBlock.i18n.php;
-$wgAutoloadClasses['TorBlockHooks'] = __DIR__ . '/includes/TorBlockHooks.php';
-$wgAutoloadClasses['TorExitNodes'] = __DIR__ . '/includes/TorExitNodes.php';
-
-$wgHooks['getUserPermissionsErrorsExpensive'][] = 
'TorBlockHooks::onGetUserPermissionsErrorsExpensive';
-$wgHooks['AbortAutoblock'][] = 'TorBlockHooks::onAbortAutoblock';
-$wgHooks['GetAutoPromoteGroups'][] = 'TorBlockHooks::onGetAutoPromoteGroups';
-$wgHooks['GetBlockedStatus'][] = 'TorBlockHooks::onGetBlockedStatus';
-$wgHooks['AutopromoteCondition'][] = 'TorBlockHooks::onAutopromoteCondition';
-$wgHooks['RecentChange_save'][] = 'TorBlockHooks::onRecentChangeSave';
-$wgHooks['ListDefinedTags'][] = 'TorBlockHooks::onListDefinedTags';
-$wgHooks['ChangeTagsListActive'][] = 'TorBlockHooks::onListDefinedTags';
-$wgHooks['AbuseFilter-filterAction'][] = 
'TorBlockHooks::onAbuseFilterFilterAction';
-$wgHooks['AbuseFilter-builder'][] = 'TorBlockHooks::onAbuseFilterBuilder';
-$wgHooks['EmailUserPermissionsErrors'][] = 
'TorBlockHooks::onEmailUserPermissionsErrors';
-$wgHooks['OtherBlockLogLink'][] = 'TorBlockHooks::onOtherBlockLogLink';
-
-// Define new autopromote condition
-define( 'APCOND_TOR', 'tor' ); // Numbers won't work, we'll get collisions
-
-/**
- * Permission keys that bypass Tor blocks.
- * Array of permission keys.
- */
-$wgTorBypassPermissions = array( 'torunblocked', /*'autoconfirmed', 
'proxyunbannable'*/ );
-$wgAvailableRights[] = 'torunblocked';
-
-$wgGroupPermissions['user']['torunblocked'] = true;
-
-/**
- * Whether to load Tor blocks if they aren't stored in memcached.
- * Set to false on high-load sites, and use a cron job with the included
- * maintenance script
- */
-$wgTorLoadNodes = true;
-
-/**
- * Actions tor users are allowed to do.
- * E.g. to allow account creation, add createaccount.
- */
-$wgTorAllowedActions = array( 'read' );
-
-/**
- * Autoconfirm limits for tor users.
- * Both regular limits, AND Tor limits must be passed.
- */
-$wgTorAutoConfirmAge = 0;
-$wgTorAutoConfirmCount = 0;
-
-/**
- * IPs to check for tor exits to.
- * (i.e. all IPs which can be used to access the site.
- */
-$wgTorIPs = array( '208.80.152.2' );
-
-/**
- * Onionoo server to use to poll information from for exit nodes.
- */
-$wgTorOnionooServer = 'https://onionoo.torproject.org';
-
-/**
- * Path to the CA file for the Onionoo server.
- * Set to false or any other invalid value to disable.
- */
-$wgTorOnionooCA = __DIR__ . /torproject.crt;
-
-/**
- * Path to the CA file for the Tor Project.
- * Set to false or any other invalid value to disable.
- */
-$wgTorProjectCA = __DIR__ . /torproject.crt;
-
-/**
- * Disable existing blocks of Tor nodes
- */
-$wgTorDisableAdminBlocks = true;
-
-/** Mark tor edits as such */
-$wgTorTagChanges = true;
-
-/**

[MediaWiki-commits] [Gerrit] Move description to message and start qqq file. - change (mediawiki...RandomGameUnit)

2015-05-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/212954

Change subject: Move description to message and start qqq file.
..

Move description to message and start qqq file.

Change-Id: I1c22cd840158c6dd88347f416ecabbf1fd65ecaa
---
M RandomGameUnit.php
M i18n/en.json
A i18n/qqq.json
3 files changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomGameUnit 
refs/changes/54/212954/1

diff --git a/RandomGameUnit.php b/RandomGameUnit.php
index 0a38ef3..9f7338c 100644
--- a/RandomGameUnit.php
+++ b/RandomGameUnit.php
@@ -30,7 +30,7 @@
'version' = '2.1',
'author' = array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
'url' = 'https://www.mediawiki.org/wiki/Extension:RandomGameUnit',
-   'description' = 'Displays a randomly chosen picture game, poll or a 
quiz',
+   'descriptionmsg' = 'game-unit-desc',
 );
 
 // Internationalization file
diff --git a/i18n/en.json b/i18n/en.json
index e0c8f6c..f060ec3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,6 +5,7 @@
David Pean david.p...@gmail.com
]
},
+game-unit-desc: Displays a randomly chosen picture game, poll or a 
quiz,
game-unit-poll-title: Take a Poll,
game-unit-quiz-title: Play the Quiz Game,
game-unit-picturegame-title: Play the Picture Game
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..4ee7a76
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,11 @@
+{
+  @metadata: {
+authors: [
+  Lewis Cawte le...@lewiscawte.me
+]
+  },
+  game-unit-desc: 
{{desc|name=RandomGameUnit|url=https://www.mediawiki.org/wiki/Extension:RandomGameUnit}};,
+  game-unit-poll-title: Take a Poll,
+  game-unit-quiz-title: Play the Quiz Game,
+  game-unit-picturegame-title: Play the Picture Game
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/212954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c22cd840158c6dd88347f416ecabbf1fd65ecaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomGameUnit
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Run basic jobs on Prezi extension - change (integration/config)

2015-05-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/212960

Change subject: Run basic jobs on Prezi extension
..

Run basic jobs on Prezi extension

Change-Id: I9f0c45f95da4f47b05c1073753b2d0deb8e8f733
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/60/212960/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7e2ce66..e7ad8d9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4038,6 +4038,11 @@
   - name: lint-js
   - name: extension-unittests-generic
 
+  - name: mediawiki/extensions/Prezi
+template:
+  - name: lint-js
+  - name: extension-unittests-generic
+  
 # Start of new currently disabled extensions checks from mass extension import 
- Addshore
 
   - name: mediawiki/extensions/AbsenteeLandlord

-- 
To view, visit https://gerrit.wikimedia.org/r/212960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f0c45f95da4f47b05c1073753b2d0deb8e8f733
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...Prezi)

2015-05-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Add extension.json
..


Add extension.json

Change-Id: Ieb37a9e210575a878976bd2d06613b101e139b29
---
A extension.json
1 file changed, 21 insertions(+), 0 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
new file mode 100644
index 000..d06f751
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,21 @@
+{
+   name: Prezi,
+   version: 1.1,
+   author: Jack Phoenix,
+   url: https://www.mediawiki.org/wiki/Extension:Prezi;,
+   descriptionmsg: prezi-desc,
+   type: parserhook,
+   MessagesDirs: {
+   Prezi: [
+   i18n
+   ]
+   },
+   AutoloadClasses: {
+   PreziTag: PreziTag.class.php
+   },
+   Hooks: {
+   ParserFirstCallInit: [
+   PreziTag::registerHook
+   ]
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/212957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb37a9e210575a878976bd2d06613b101e139b29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Prezi
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...Prezi)

2015-05-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/212957

Change subject: Add extension.json
..

Add extension.json

Change-Id: Ieb37a9e210575a878976bd2d06613b101e139b29
---
A extension.json
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Prezi 
refs/changes/57/212957/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..d06f751
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,21 @@
+{
+   name: Prezi,
+   version: 1.1,
+   author: Jack Phoenix,
+   url: https://www.mediawiki.org/wiki/Extension:Prezi;,
+   descriptionmsg: prezi-desc,
+   type: parserhook,
+   MessagesDirs: {
+   Prezi: [
+   i18n
+   ]
+   },
+   AutoloadClasses: {
+   PreziTag: PreziTag.class.php
+   },
+   Hooks: {
+   ParserFirstCallInit: [
+   PreziTag::registerHook
+   ]
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/212957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb37a9e210575a878976bd2d06613b101e139b29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Prezi
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Direct use of __DIR__ - change (mediawiki...Tabber)

2015-01-29 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/187599

Change subject: Direct use of __DIR__
..

Direct use of __DIR__

Change-Id: Iad0f2e7f6135c7afb7426acda49424cc65c9a381
---
M Tabber.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Tabber 
refs/changes/99/187599/1

diff --git a/Tabber.php b/Tabber.php
index 8ec5de8..b2306f0 100644
--- a/Tabber.php
+++ b/Tabber.php
@@ -11,11 +11,10 @@
'descriptionmsg' = 'tabber-desc',
'version' = '1.3.0'
 );
-$dir = dirname(__FILE__) . '/';
 
 # Internationalisation file
 $wgMessagesDirs['Tabber'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Tabber'] = $dir . 'Tabber.i18n.php';
+$wgExtensionMessagesFiles['Tabber'] = __DIR__ . '/Tabber.i18n.php';
 
 $wgExtensionFunctions[] = wfTabber;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/187599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad0f2e7f6135c7afb7426acda49424cc65c9a381
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Tabber
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make SQLite (Jenkins) happy - change (mediawiki...Comments)

2015-01-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Make SQLite (Jenkins) happy
..


Make SQLite (Jenkins) happy

Trailing commas... And also remove a dodgy index

Change-Id: I67ca487cbe81b939576038390366618af4e3a4dd
---
M sql/comments.sql
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/sql/comments.sql b/sql/comments.sql
index ac7d541..e9fbaef 100644
--- a/sql/comments.sql
+++ b/sql/comments.sql
@@ -7,13 +7,12 @@
   Comment_Text text NOT NULL,
   Comment_Date datetime NOT NULL default '-00-00 00:00:00',
   Comment_Parent_ID int(11) NOT NULL default 0,
-  Comment_IP varchar(45) NOT NULL default '',
+  Comment_IP varchar(45) NOT NULL default ''
 ) /*$wgDBTableOptions*/;
 
 CREATE INDEX /*i*/comment_page_id_index ON /*_*/Comments (Comment_Page_ID);
 CREATE INDEX /*i*/wiki_user_id ON /*_*/Comments (Comment_user_id);
 CREATE INDEX /*i*/wiki_user_name ON /*_*/Comments (Comment_Username);
-CREATE INDEX /*i*/comment_date ON /*_*/Comments (Comment_Minus_Count);
 
 CREATE TABLE /*_*/Comments_Vote (
   Comment_Vote_ID int(11) NOT NULL default 0,

-- 
To view, visit https://gerrit.wikimedia.org/r/186005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I67ca487cbe81b939576038390366618af4e3a4dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Comments
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] .jshintrc based on Nimbus skin. - change (mediawiki...Bouquet)

2014-11-10 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172269

Change subject: .jshintrc based on Nimbus skin.
..

.jshintrc based on Nimbus skin.

Change-Id: I3975e9d6878c362995948ab3622a37a22a1b4d5e
---
A .jshintrc
1 file changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Bouquet 
refs/changes/69/172269/1

diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..180ac6a
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,26 @@
+{
+   /* Common */
+
+   // Enforcing
+   camelcase: false,
+   curly: true,
+   eqeqeq: true,
+   immed: true,
+   latedef: true,
+   newcap: true,
+   noarg: true,
+   noempty: true,
+   nonew: true,
+   quotmark: single,
+   trailing: true,
+   undef: true,
+   unused: true,
+   // Legacy
+   onevar: true,
+
+   /* Local */
+   predef: [
+   mediaWiki,
+   jQuery
+   ]
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/172269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3975e9d6878c362995948ab3622a37a22a1b4d5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Trigger tests for EditAccount - change (integration/config)

2014-11-10 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172276

Change subject: Trigger tests for EditAccount
..

Trigger tests for EditAccount

Change-Id: I81bfa768c851cf924b32cc051d0c6ff736e32ae2
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/172276/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 9083751..5dc7ca2 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -484,6 +484,7 @@
  - DynamicSidebar
  - E3Experiments
  - Echo
+ - EditAccount
  - Editcount
  - EditPageTracking
  - EditSubpages

-- 
To view, visit https://gerrit.wikimedia.org/r/172276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81bfa768c851cf924b32cc051d0c6ff736e32ae2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...EditAccount)

2014-11-10 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172283

Change subject: Add .gitreview
..

Add .gitreview

Change-Id: Iadb733988d0b5bf00b03c5d33123142801472d24
---
A .gitreview
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditAccount 
refs/changes/83/172283/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..74cf168
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/EditAccount
+defaultbranch=master
+defaultrebase=0

-- 
To view, visit https://gerrit.wikimedia.org/r/172283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb733988d0b5bf00b03c5d33123142801472d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditAccount
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...EditAccount)

2014-11-10 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Add .gitreview
..


Add .gitreview

Change-Id: Iadb733988d0b5bf00b03c5d33123142801472d24
---
A .gitreview
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..74cf168
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/EditAccount
+defaultbranch=master
+defaultrebase=0

-- 
To view, visit https://gerrit.wikimedia.org/r/172283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadb733988d0b5bf00b03c5d33123142801472d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditAccount
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Tests for Bouquet skin. - change (integration/config)

2014-10-31 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/170447

Change subject: Tests for Bouquet skin.
..

Tests for Bouquet skin.

Change-Id: Idb951ad16a47ad95ef10a35235f7dae9c4fdadfb
---
M jjb/mediawiki-skins.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/47/170447/1

diff --git a/jjb/mediawiki-skins.yaml b/jjb/mediawiki-skins.yaml
index 202aa7c..4b498e9 100644
--- a/jjb/mediawiki-skins.yaml
+++ b/jjb/mediawiki-skins.yaml
@@ -24,6 +24,11 @@
  - mediawiki-skin-jobs
 
 - project:
+name: 'mw-skins-Bouquet'
+jobs:
+ - mediawiki-skin-jobs
+
+- project:
 name: 'mw-skins-chameleon'
 jobs:
  - mediawiki-skin-jobs

-- 
To view, visit https://gerrit.wikimedia.org/r/170447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb951ad16a47ad95ef10a35235f7dae9c4fdadfb
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use Config instead of globals - change (mediawiki...Truglass)

2014-10-26 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/168912

Change subject: Use Config instead of globals
..

Use Config instead of globals

Change-Id: If6eac180316ef626e319fbd39988259dfcaffe16
---
M Truglass.skin.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass 
refs/changes/12/168912/1

diff --git a/Truglass.skin.php b/Truglass.skin.php
index 460b650..31f9984 100644
--- a/Truglass.skin.php
+++ b/Truglass.skin.php
@@ -263,7 +263,7 @@
form name=searchform 
action=?php $this-text( 'wgScript' ) ? id=searchform
input 
type=hidden name=title value=?php $this-text( 'searchtitle' ) ?/
input 
type=hidden name=fulltext class=searchButton value=?php $this-msg( 
'search' ) ? /
-   img src=?php 
$this-text( 'stylepath' ) ?/Truglass/?php $this-text( 'stylename' ) 
?/searchleftcap?php if( $wgLang-isRTL() ) echo '_rtl'; ?.gif alt= 
width=17 height=19 border=0 id=s1 class=srchimgs /
+   img src=?php 
$this-text( 'stylepath' ) ?/Truglass/?php $this-text( 'stylename' ) 
?/searchleftcap?php if( RequestContext::getMain()-getLanguage()-is) echo 
'_rtl'; ?.gif alt= width=17 height=19 border=0 id=s1 
class=srchimgs /
input 
type=text name=search class=sbox id=q01 ?php if( $this-haveMsg( 
'accesskey-search' ) ) { ?accesskey=?php $this-msg( 'accesskey-search' ) 
??php } if( isset( $this-data['search'] ) ) { ? value=?php $this-text( 
'search' ) ??php } ? /
img src=?php 
$this-text( 'stylepath' ) ?/Truglass/?php $this-text( 'stylename' ) 
?/searchrightcap?php if( $wgLang-isRTL() ) echo '_rtl'; ?.gif alt= 
width=9 height=19 border=0 id=s2 class=srchimgs /
/form
@@ -340,9 +340,9 @@
 * an array.
 */
function networkNavigationBox() {
-   global $wgTruglassSidebarLinks;
+   $sidebarLinks = $this-config-get( 'TruglassSidebarLinks' );
 
-   if( is_array( $wgTruglassSidebarLinks )  !empty( 
$wgTruglassSidebarLinks ) ) {
+   if( is_array( $sidebarLinks )  !empty( $sidebarLinks ) ) {
 ?
div class=sbmodule 
id=sbm-networknav
h4 class=sbmoduletitle 
displayer?php echo wfMessage( 'truglass-links' )-parse() ?/h4
@@ -350,7 +350,7 @@
div class=stretcher
ul
?php
-   foreach 
( $wgTruglassSidebarLinks as $link = $title ) {
+   foreach 
( $sidebarLinks as $link = $title ) {

echo 'lia href=http://' . $link . '/' . $title . '/a/li';
}
?

-- 
To view, visit https://gerrit.wikimedia.org/r/168912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6eac180316ef626e319fbd39988259dfcaffe16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use Config for a few globals. - change (mediawiki...Bouquet)

2014-10-26 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/168913

Change subject: Use Config for a few globals.
..

Use Config for a few globals.

Change-Id: I17903c77d680a3d908a850557c4879a5e366
---
M Bouquet.skin.php
1 file changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Bouquet 
refs/changes/13/168913/1

diff --git a/Bouquet.skin.php b/Bouquet.skin.php
index 014da98..2b47142 100644
--- a/Bouquet.skin.php
+++ b/Bouquet.skin.php
@@ -55,8 +55,9 @@
 * @return String: logo image URL
 */
private function getLogo() {
-   global $wgStylePath, $wgDefaultTheme;
+   global $wgStylePath;
 
+   $defaultTheme = $this-config-get( 'DefaultTheme' );
$logoURL = '';
$customLogo = wfFindFile( 'Bouquet-skin-logo.png' );
 
@@ -72,8 +73,8 @@
$themeFromRequest = 
$this-getSkin()-getRequest()-getVal( 'usetheme', false );
if ( $themeFromRequest ) {
$themeName = $themeFromRequest;
-   } elseif ( isset( $wgDefaultTheme )  $wgDefaultTheme 
!= 'default' ) {
-   $themeName = $wgDefaultTheme;
+   } elseif ( isset( $defaultTheme )  $defaultTheme != 
'default' ) {
+   $themeName = $defaultTheme;
} else {
$themeName = false;
}
@@ -101,7 +102,6 @@
 * outputs a formatted page.
 */
public function execute() {
-   global $wgSitename;
 
$this-data['pageLanguage'] = 
$this-getSkin()-getTitle()-getPageViewLanguage()-getHtmlCode();
 
@@ -112,13 +112,13 @@
?php echo Html::element( 'a', array(
'href' = 
$this-data['nav_urls']['mainpage']['href'],
'class' = 'header-link',
-   'title' = $wgSitename,
+   'title' = $this-config-get( 'Sitename' ),
'rel' = 'home'
) + Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) ); ?
div
h1 class=firstHeading id=site-titlespan 
dir=auto?php echo Html::element( 'a', array(
'href' = 
$this-data['nav_urls']['mainpage']['href'] )
-   + 
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ), $wgSitename ); ?/span/h1
+   + 
Linker::tooltipAndAccesskeyAttribs( 'p-logo' ), $this-config-get( 'Sitename' 
) ); ?/span/h1
h2 id=site-description?php $this-msg( 'tagline' ) 
?/h2
/div
/header!-- #branding --
@@ -313,7 +313,6 @@
}
 
function searchBox() {
-   global $wgUseTwoButtonsSearchForm;
 ?
aside id=search-3 
class=widget widget_search
form role=search 
method=get id=searchform class=searchform action=?php $this-text( 
'wgScript' ) ?
@@ -323,7 +322,7 @@
?php

echo $this-makeSearchInput( array( 'id' = 'searchInput' ) );

echo $this-makeSearchButton( 'go', array( 'id' = 'searchGoButton', 'class' = 
'searchButton' ) );
-   
if ( $wgUseTwoButtonsSearchForm ) {
+   
if ( $this-config-get( 'UseTwoButtonsSearchForm' ) ) {

echo '#160;';

echo $this-makeSearchButton( 'fulltext', array( 'id' = 
'mw-searchButton', 'class' = 'searchButton' ) );

} else { ?

-- 
To view, visit https://gerrit.wikimedia.org/r/168913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17903c77d680a3d908a850557c4879a5e366
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [DONOTMERGE] Test test - change (mediawiki...BayesianFilter)

2014-10-03 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/164525

Change subject: [DONOTMERGE] Test test
..

[DONOTMERGE] Test test

Test to see if the mwext-BayesianFilter-testextension will work.

Change-Id: Ie2161c0f0653e05bd1e3173f88123fe2f27b987c
---
M db_patches/word_frequency.sql
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BayesianFilter 
refs/changes/25/164525/1

diff --git a/db_patches/word_frequency.sql b/db_patches/word_frequency.sql
index f5ebe48..3a29aac 100644
--- a/db_patches/word_frequency.sql
+++ b/db_patches/word_frequency.sql
@@ -1,11 +1,11 @@
 DROP TABLE IF EXISTS /*_*/word_frequency;
 
 CREATE TABLE /*_*/word_frequency (
-  `wf_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `wf_id` int unsigned not null primary key auto_increment,
   `wf_word` varchar(100) DEFAULT NULL,
   `wf_spam` int(10) unsigned NOT NULL,
   `wf_ham` int(10) unsigned NOT NULL,
   PRIMARY KEY (`wf_id`)
 ) /*$wgDBTableOptions*/;
 
-CREATE INDEX  /*i*/word_frequency_word ON /*_*/word_frequency(wf_word);
\ No newline at end of file
+CREATE INDEX  /*i*/word_frequency_word ON /*_*/word_frequency(wf_word);

-- 
To view, visit https://gerrit.wikimedia.org/r/164525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2161c0f0653e05bd1e3173f88123fe2f27b987c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BayesianFilter
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Version 1.4.0 - change (mediawiki...RefreshSpecial)

2014-08-28 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/156830

Change subject: Version 1.4.0
..

Version 1.4.0

From ShoutWiki SVN repository. Rewrote the JS in jQuery, and
make use of RequestContext instead of globals.

Change-Id: Ie249b5accea13069b61411ca9bb64c8691736dd1
---
M RefreshSpecial.alias.php
M RefreshSpecial.body.php
M RefreshSpecial.js
M RefreshSpecial.php
4 files changed, 128 insertions(+), 98 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RefreshSpecial 
refs/changes/30/156830/1

diff --git a/RefreshSpecial.alias.php b/RefreshSpecial.alias.php
index f1342aa..0d2c418 100644
--- a/RefreshSpecial.alias.php
+++ b/RefreshSpecial.alias.php
@@ -162,4 +162,4 @@
 /** Traditional Chinese (中文（繁體）‎) */
 $specialPageAliases['zh-hant'] = array(
'RefreshSpecial' = array( '特殊重新載入' ),
-);
\ No newline at end of file
+);
diff --git a/RefreshSpecial.body.php b/RefreshSpecial.body.php
index 10b7ac3..75ba53a 100644
--- a/RefreshSpecial.body.php
+++ b/RefreshSpecial.body.php
@@ -19,42 +19,37 @@
/**
 * Show the special page
 *
-* @param $par Mixed: parameter passed to the page or null
+* @param mixed $par Parameter passed to the page or null
 */
public function execute( $par ) {
-   global $wgOut, $wgUser, $wgRequest;
+   $out = $this-getOutput();
+   $request = $this-getRequest();
+   $user = $this-getUser();
 
+   // Can the user execute the action?
+   $this-checkPermissions();
 
+   // Is the database in read-only mode?
+   $this-checkReadOnly();
 
-   $wgOut-setPageTitle( wfMsg( 'refreshspecial-title' ) );
-
-   # If the user doesn't have the required permission, display an 
error
-   if( !$wgUser-isAllowed( 'refreshspecial' ) ) {
-   $wgOut-permissionRequired( 'refreshspecial' );
+   // Is the user blocked? If so they can't make new wikis
+   if ( $user-isBlocked() ) {
+   $out-blockedPage();
return;
}
 
-   # Show a message if the database is in read-only mode
-   if ( wfReadOnly() ) {
-   $wgOut-readOnlyPage();
-   return;
-   }
-
-   # If user is blocked, s/he doesn't need to access this page
-   if ( $wgUser-isBlocked() ) {
-   $wgOut-blockedPage();
-   return;
-   }
+   $out-setPageTitle( $this-msg( 'refreshspecial-title' 
)-plain() );
 
$cSF = new RefreshSpecialForm();
+   $cSF-setContext( $this-getContext() );
 
-   $action = $wgRequest-getVal( 'action' );
-   if( 'success' == $action ) {
+   $action = $request-getVal( 'action' );
+   if ( $action == 'success' ) {
/* do something */
-   } elseif( 'failure' == $action ) {
-   $cSF-showForm( wfMsg('refreshspecial-fail') );
-   } elseif( $wgRequest-wasPosted()  'submit' == $action 
-   $wgUser-matchEditToken( $wgRequest-getVal( 
'wpEditToken' ) ) ) {
+   } elseif ( $action == 'failure' ) {
+   $cSF-showForm( $this-msg( 'refreshspecial-fail' 
)-plain() );
+   } elseif ( $request-wasPosted()  $action == 'submit' 
+   $user-matchEditToken( $request-getVal( 'wpEditToken' 
) ) ) {
$cSF-doSubmit();
} else {
$cSF-showForm( '' );
@@ -66,33 +61,40 @@
  * RefreshSpecialForm class
  * Constructs and displays the form
  */
-class RefreshSpecialForm {
-   public $mMode, $mLink;
+class RefreshSpecialForm extends ContextSource {
+   public $mLink;
 
/**
 * Show the actual form
 *
-* @param $err string Error message if there was an error, otherwise 
null
+* @param string $err Error message if there was an error, otherwise 
empty
 */
function showForm( $err ) {
-   global $wgOut, $wgUser, $wgRequest, $wgScriptPath, 
$wgQueryPages;
+   $out = $this-getOutput();
 
-   $token = htmlspecialchars( $wgUser-getEditToken() );
+   $token = htmlspecialchars( $this-getUser()-getEditToken() );
$titleObj = SpecialPage::getTitleFor( 'RefreshSpecial' );
$action = htmlspecialchars( $titleObj-getLocalURL( 
'action=submit' ) );
 
-   if ( '' != $err ) {
-   $wgOut-setSubtitle( wfMsgHtml( 'formerror' ) );
-   $wgOut-addHTML( p class='error'{$err}/p\n );
+   if ( $err != '' ) {
+

[MediaWiki-commits] [Gerrit] Embed images + tweaks - change (mediawiki...Daddio)

2014-08-27 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/156672

Change subject: Embed images + tweaks
..

Embed images + tweaks

Embed skin images with resourceloader and fix description
message in $wgExtensionCredits.

Change-Id: I46070fe751a1ace0a0656680fb379197db528b93
---
M Daddio.php
M Daddio.skin.php
M daddio/main.css
3 files changed, 19 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/72/156672/1

diff --git a/Daddio.php b/Daddio.php
index a5dfc3c..da9a2b9 100644
--- a/Daddio.php
+++ b/Daddio.php
@@ -18,7 +18,7 @@
'name' = 'Daddio',
// @todo FIXME: add a meaningful version number
'author' = array( 'Rufus Post', 'Aaron Schulz' ),
-   'description-msg' = 'daddio-desc',
+   'descriptionmsg' = 'daddio-desc',
'url' = 'https://www.mediawiki.org/wiki/Skin:Daddio',
 );
 
diff --git a/Daddio.skin.php b/Daddio.skin.php
index e8765f1..ff8283e 100644
--- a/Daddio.skin.php
+++ b/Daddio.skin.php
@@ -20,7 +20,7 @@
$template = 'DaddioTemplate', $useHeadElement = true;
 
function setupSkinUserCss( OutputPage $out ) {
-   $out-addModuleStyles( array( 'skins.daddio', 
'mediawiki.legacy.shared' ) );
+   $out-addModuleStyles( array( 'mediawiki.legacy.shared', 
'skins.daddio' ) );
}
 }
 
diff --git a/daddio/main.css b/daddio/main.css
index 55abc3b..98056de 100644
--- a/daddio/main.css
+++ b/daddio/main.css
@@ -11,6 +11,7 @@
list-style-type: square;
margin: .3em 0 0 1.3em;
padding: 0;
+   /* @embed */
list-style-image: url(bullet.gif);
 }
 ol {
@@ -88,6 +89,7 @@
padding: 0 0 0 0;
display: block;
height: 25px;
+   /* @embed */
background: url(toolbar-bg.png);
 }
 
@@ -111,6 +113,7 @@
 }
 
 #p-personal li:hover {
+   /* @embed */
background: url(buttonred.png);
 }
 
@@ -174,18 +177,21 @@
 .generated-sidebar.portlet h5 {
width: 90%;
height: 64px;
+   /* @embed */
background: url(navbox.png) center right no-repeat;
 }
 
 #p-search h5 {
width: 90%;
height: 64px;
+   /* @embed */
background: url(searchbox.png) center right no-repeat;
 }
 
 #p-tb h5 {
width: 90%;
height: 64px;
+   /* @embed */
background: url(toolbox.png) center right no-repeat;
 }
 
@@ -208,6 +214,7 @@
height: 1.3em;
padding: 0 0 0 0;
margin: 0 0 0 14em;
+   /* @embed */
background: url(edit.png) center right no-repeat;
background-color: #E9E9E9;
border: solid 1px #bb;
@@ -265,6 +272,7 @@
 
 #footer {
background-color: #f0f0f0;
+   /* @embed */
background: url(footer-grad.png) repeat-x 0 0;
padding: 10px 1em 1em 1em;
clear:both;
@@ -400,30 +408,36 @@
 
 #mw_content a.external,
 #mw_content a[href ^=gopher://;] {
+   /* @embed */
 background: url(external.png) center right no-repeat;
 padding-right: 13px;
 }
 #mw_content a[href ^=https://;],
 .link-https {
+   /* @embed */
 background: url(lock_icon.gif) center right no-repeat;
 padding-right: 16px;
 }
 #mw_content a[href ^=mailto:;],
 .link-mailto {
+   /* @embed */
 background: url(mail_icon.gif) center right no-repeat;
 padding-right: 18px;
 }
 #mw_content a[href ^=news://;] {
+   /* @embed */
 background: url(news_icon.png) center right no-repeat;
 padding-right: 18px;
 }
 #mw_content a[href ^=ftp://;],
 .link-ftp {
+   /* @embed */
 background: url(file_icon.gif) center right no-repeat;
 padding-right: 18px;
 }
 #mw_content a[href ^=irc://],
 .link-irc {
+   /* @embed */
 background: url(discussionitem_icon.gif) center right no-repeat;
 padding-right: 18px;
 }
@@ -435,6 +449,7 @@
 #mw_content a.external[href $=.wav], #mw_content a.external[href $=.WAV],
 #mw_content a.external[href $=.wma], #mw_content a.external[href $=.WMA],
 .link-audio {
+   /* @embed */
 background: url(audio.png) center right no-repeat;
 padding-right: 13px;
 }
@@ -443,6 +458,7 @@
 #mw_content a.external[href $=.mpeg], #mw_content a.external[href $=.MPEG],
 #mw_content a.external[href $=.mpg], #mw_content a.external[href $=.MPG],
 .link-video {
+   /* @embed */
 background: url(video.png) center right no-repeat;
 padding-right: 13px;
 }
@@ -450,6 +466,7 @@
 #mw_content a.external[href *=.pdf#], #mw_content a.external[href *=.PDF#],
 #mw_content a.external[href *=.pdf?], #mw_content a.external[href *=.PDF?],
 .link-document {
+   /* @embed */
 background: url(document.png) center right no-repeat;
 padding-right: 12px;
 }
@@ -842,10 +859,6 @@
 /* @bug 1714 */
 input#wpSave, input#wpDiff {
margin-right: 0.33em;
-}
-
-#editform .editOptions {
-

[MediaWiki-commits] [Gerrit] Use new external links skinning module. - change (mediawiki...MonoBook)

2014-08-27 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/156700

Change subject: Use new external links skinning module.
..

Use new external links skinning module.

Core module reduces the amount of duplicated code across skins,
see core change-id: I8ecbc827f2b05aec79401ac4962fcc15387c8ad8.

Change-Id: Icb4683f0382c9b2984db5293cd01f715c5320552
---
M SkinMonoBook.php
M main.css
2 files changed, 13 insertions(+), 88 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/00/156700/1

diff --git a/SkinMonoBook.php b/SkinMonoBook.php
index 16fbd00..0546e75 100644
--- a/SkinMonoBook.php
+++ b/SkinMonoBook.php
@@ -40,7 +40,11 @@
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
 
-   $out-addModuleStyles( array( 'mediawiki.skinning.interface', 
'skins.monobook.styles' ) );
+   $out-addModuleStyles( array(
+   'mediawiki.skinning.interface',
+   'mediawiki.skinning.content.externallinks',
+   'skins.monobook.styles'
+   ) );
 
// TODO: Migrate all of these
$out-addStyle( $this-stylename . '/IE60Fixes.css', 'screen', 
'IE 6' );
diff --git a/main.css b/main.css
index bda0240..a5e039f 100644
--- a/main.css
+++ b/main.css
@@ -88,6 +88,14 @@
list-style-image: url(bullet.gif);
 }
 
+input.historysubmit {
+   padding: 0 .3em .3em .3em !important;
+   font-size: 94%;
+   cursor: pointer;
+   height: 1.7em !important;
+   margin-left: 1.6em;
+}
+
 pre, .mw-code {
line-height: 1.1em;
 }
@@ -138,93 +146,6 @@
line-height: 1.4em;
margin: 0;
padding: 0;
-}
-
-/*
-** keep the whitespace in front of the ^=, hides rule from konqueror
-** this is css3, the validator doesn't like it when validating as css2
-*/
-#bodyContent a.external {
-   /* @embed */
-   background: url(external-ltr.png) center right no-repeat;
-   padding-right: 13px;
-}
-
-#bodyContent a.external[href ^=https://;],
-.link-https {
-   /* @embed */
-   background: url(lock_icon.gif) center right no-repeat;
-   padding-right: 16px;
-}
-
-#bodyContent a.external[href ^=mailto:;],
-.link-mailto {
-   /* @embed */
-   background: url(mail_icon.gif) center right no-repeat;
-   padding-right: 18px;
-}
-
-#bodyContent a.external[href ^=news:;] {
-   /* @embed */
-   background: url(news_icon.png) center right no-repeat;
-   padding-right: 18px;
-}
-
-#bodyContent a.external[href ^=ftp://;],
-.link-ftp {
-   /* @embed */
-   background: url(file_icon.gif) center right no-repeat;
-   padding-right: 18px;
-}
-
-#bodyContent a.external[href ^=irc://],
-#bodyContent a.external[href ^=ircs://],
-.link-irc {
-   /* @embed */
-   background: url(discussionitem_icon.gif) center right no-repeat;
-   padding-right: 18px;
-}
-
-#bodyContent a.external[href $=.ogg], #bodyContent a.external[href $=.OGG],
-#bodyContent a.external[href $=.mid], #bodyContent a.external[href $=.MID],
-#bodyContent a.external[href $=.midi], #bodyContent a.external[href 
$=.MIDI],
-#bodyContent a.external[href $=.mp3], #bodyContent a.external[href $=.MP3],
-#bodyContent a.external[href $=.wav], #bodyContent a.external[href $=.WAV],
-#bodyContent a.external[href $=.wma], #bodyContent a.external[href $=.WMA],
-.link-audio {
-   /* @embed */
-   background: url(audio.png) center right no-repeat;
-   padding-right: 13px;
-}
-
-#bodyContent a.external[href $=.ogm], #bodyContent a.external[href $=.OGM],
-#bodyContent a.external[href $=.avi], #bodyContent a.external[href $=.AVI],
-#bodyContent a.external[href $=.mpeg], #bodyContent a.external[href 
$=.MPEG],
-#bodyContent a.external[href $=.mpg], #bodyContent a.external[href $=.MPG],
-.link-video {
-   /* @embed */
-   background: url(video.png) center right no-repeat;
-   padding-right: 13px;
-}
-
-#bodyContent a.external[href $=.pdf], #bodyContent a.external[href $=.PDF],
-#bodyContent a.external[href *=.pdf#], #bodyContent a.external[href 
*=.PDF#],
-#bodyContent a.external[href *=.pdf?], #bodyContent a.external[href 
*=.PDF?],
-.link-document {
-   /* @embed */
-   background: url(document.png) center right no-repeat;
-   padding-right: 12px;
-}
-
-/* Interwiki Styling */
-#bodyContent a.extiw,
-#bodyContent a.extiw:active {
-   color: #36b;
-}
-
-/* External links */
-#bodyContent a.external {
-   color: #36b;
 }
 
 /*

-- 
To view, visit https://gerrit.wikimedia.org/r/156700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb4683f0382c9b2984db5293cd01f715c5320552
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] Fix ResourceLoader calls. - change (mediawiki...Daddio)

2014-08-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155907

Change subject: Fix ResourceLoader calls.
..

Fix ResourceLoader calls.

Change-Id: I97b1c10b7c4d6bd3ed5f42c7e8dd09360c5f2666
---
M Daddio.php
M Daddio.skin.php
2 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/07/155907/1

diff --git a/Daddio.php b/Daddio.php
index 914ba92..a5dfc3c 100644
--- a/Daddio.php
+++ b/Daddio.php
@@ -32,12 +32,10 @@
 
 $wgResourceModules['skins.daddio'] = array(
'styles' = array(
-   // @Lcawte: this probably isn't the most kosher way to do this, 
but it's
-   // how most/all ShoutWiki skins do it and it works for our 
setup at
-   // least. Feel free to improve it :D
-   'skins/Daddio/daddio/main.css' = array( 'media' = 'screen' ),
-   'skins/Daddio/daddio/print.css' = array( 'media' = 'print' )
+   'daddio/main.css' = array( 'media' = 'screen' ),
+   'daddio/print.css' = array( 'media' = 'print' )
),
'position' = 'top',
-   //'localBasePath' = __DIR__,
+   'localBasePath' = __DIR__,
+   'remoteSkinPath' = 'Daddio',
 );
diff --git a/Daddio.skin.php b/Daddio.skin.php
index e9921dd..e8765f1 100644
--- a/Daddio.skin.php
+++ b/Daddio.skin.php
@@ -20,7 +20,7 @@
$template = 'DaddioTemplate', $useHeadElement = true;
 
function setupSkinUserCss( OutputPage $out ) {
-   $out-addModuleStyles( 'skin.daddio' );
+   $out-addModuleStyles( array( 'skins.daddio', 
'mediawiki.legacy.shared' ) );
}
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/155907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97b1c10b7c4d6bd3ed5f42c7e8dd09360c5f2666
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Daddio
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Some cleanup of Daddio skin. - change (mediawiki...Daddio)

2014-08-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155906

Change subject: Some cleanup of Daddio skin.
..

Some cleanup of Daddio skin.

Various improvements, or at least I hope this is an improvement over the
status quo.

Untested, but mostly based on MonoBook, so it should work(TM).

Change-Id: I12baef6296779fe1c1d222d173cc0095948a2e4d
---
M Daddio.php
M Daddio.skin.php
2 files changed, 99 insertions(+), 76 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/06/155906/1

diff --git a/Daddio.php b/Daddio.php
index d9446b8..914ba92 100644
--- a/Daddio.php
+++ b/Daddio.php
@@ -16,20 +16,28 @@
 $wgExtensionCredits['skin'][] = array(
'path' = __FILE__,
'name' = 'Daddio',
+   // @todo FIXME: add a meaningful version number
'author' = array( 'Rufus Post', 'Aaron Schulz' ),
'description-msg' = 'daddio-desc',
'url' = 'https://www.mediawiki.org/wiki/Skin:Daddio',
 );
 
 $wgValidSkinNames['daddio'] = 'Daddio';
-$wgAutoloadClasses['SkinDaddio'] = __DIR__ . /Daddio.skin.php;
+// *cough cough* assumptions...
+if ( !isset( $wgAutoloadClasses['ModernTemplate'] ) ) {
+   $wgAutoloadClasses['ModernTemplate'] = __DIR__ . 
'/../Modern/SkinModern.php';
+}
+$wgAutoloadClasses['SkinDaddio'] = __DIR__ . '/Daddio.skin.php';
 $wgMessagesDirs['SkinDaddio'] = __DIR__ . '/i18n';
 
 $wgResourceModules['skins.daddio'] = array(
'styles' = array(
-   'daddio/main.css' = array( 'media' = 'screen' ),
-   'daddio/print.css' = array( 'media' = 'print' )
-// 'daddio/rtl.css', 'screen', '', 'rtl' );
+   // @Lcawte: this probably isn't the most kosher way to do this, 
but it's
+   // how most/all ShoutWiki skins do it and it works for our 
setup at
+   // least. Feel free to improve it :D
+   'skins/Daddio/daddio/main.css' = array( 'media' = 'screen' ),
+   'skins/Daddio/daddio/print.css' = array( 'media' = 'print' )
),
-   'localBasePath' = __DIR__,
+   'position' = 'top',
+   //'localBasePath' = __DIR__,
 );
diff --git a/Daddio.skin.php b/Daddio.skin.php
index a930ae2..e9921dd 100644
--- a/Daddio.skin.php
+++ b/Daddio.skin.php
@@ -3,28 +3,25 @@
  * Daddio skin. Skin for getting work done.
  * Based on Modern, modified by Rufus Post, Aaron Schulz
  *
+ * @file
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if ( !defined( 'MEDIAWIKI' ) ) {
die( -1 );
-
-global $IP;
-// @todo Fixme: autoload ModernTemplate
-require_once( $IP/skins/Modern/Modern.php );
+}
 
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
- * @todo document
+ *
  * @ingroup Skins
  */
 class SkinDaddio extends SkinTemplate {
public $skinname = 'daddio', $stylename = 'daddio',
$template = 'DaddioTemplate', $useHeadElement = true;
 
-   function setupSkinUserCss( OutputPage $out ){
-   $out-addModules( 'skin.daddio' );
+   function setupSkinUserCss( OutputPage $out ) {
+   $out-addModuleStyles( 'skin.daddio' );
}
-
 }
 
 /**
@@ -39,14 +36,13 @@
 * Takes an associative array of data set from a SkinTemplate-based
 * class, and a wrapper for MediaWiki's localization database, and
 * outputs a formatted page.
-*
-* @access private
 */
-   function execute() {
-   $this-skin = $skin = $this-data['skin'];
+   public function execute() {
+   $this-skin = $this-data['skin'];
+
+   $this-data['pageLanguage'] = 
$this-skin-getTitle()-getPageViewLanguage()-getHtmlCode();
 
$this-html( 'headelement' );
-
 ?
!-- heading --
 
@@ -54,15 +50,14 @@
div id=mw_contentwrapper
!-- navigation portlet --
div class=portlet id=p-cactions
-   h5?php $this-msg('views') ?/h5
+   h5?php $this-msg( 'views' ) ?/h5
div class=pBody
ul
-   ?php   foreach($this-data['content_actions'] as $key 
= $tab) { ?
-li id=ca-?php echo 
Sanitizer::escapeId($key) ??php
-   if($tab['class']) { ? 
class=?php echo htmlspecialchars($tab['class']) ??php }
-?a href=?php echo 
htmlspecialchars($tab['href']) ??php echo 
$skin-tooltipAndAccesskeyAttribs('ca-'.$key) ??php
-echo htmlspecialchars($tab['text']) 
?/a/li
-   ?php} ?
+   ?php
+   foreach ( $this-data['content_actions'] as 
$key = $tab ) {
+   echo $this-makeListItem( $key, $tab );
+   }
+   ?
/ul
/div
/div

[MediaWiki-commits] [Gerrit] Some cleanup to Daddio skin. - change (mediawiki...Daddio)

2014-08-23 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155905

Change subject: Some cleanup to Daddio skin.
..

Some cleanup to Daddio skin.

Basic resourceloader support, fix Modern include
to work with recent pathing.

Also rename class file to meet the precedent set by
other third-party skins of having the templates at
Skinname.skin.php.

Change-Id: I68e6bdbb249bb5b7b572d344099b03e1419f941e
---
M Daddio.php
R Daddio.skin.php
2 files changed, 20 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/05/155905/1

diff --git a/Daddio.php b/Daddio.php
index adcce67..d9446b8 100644
--- a/Daddio.php
+++ b/Daddio.php
@@ -22,5 +22,14 @@
 );
 
 $wgValidSkinNames['daddio'] = 'Daddio';
-$wgAutoloadClasses['SkinDaddio'] = dirname( __FILE__ ) . /Daddio.class.php;
-$wgMessagesDirs['SkinDaddio'] = __DIR__ . '/i18n';
\ No newline at end of file
+$wgAutoloadClasses['SkinDaddio'] = __DIR__ . /Daddio.skin.php;
+$wgMessagesDirs['SkinDaddio'] = __DIR__ . '/i18n';
+
+$wgResourceModules['skins.daddio'] = array(
+   'styles' = array(
+   'daddio/main.css' = array( 'media' = 'screen' ),
+   'daddio/print.css' = array( 'media' = 'print' )
+// 'daddio/rtl.css', 'screen', '', 'rtl' );
+   ),
+   'localBasePath' = __DIR__,
+);
diff --git a/Daddio.class.php b/Daddio.skin.php
similarity index 86%
rename from Daddio.class.php
rename to Daddio.skin.php
index 35757e0..a930ae2 100644
--- a/Daddio.class.php
+++ b/Daddio.skin.php
@@ -10,7 +10,7 @@
 
 global $IP;
 // @todo Fixme: autoload ModernTemplate
-require_once( $IP/skins/Modern.php );
+require_once( $IP/skins/Modern/Modern.php );
 
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
@@ -18,19 +18,11 @@
  * @ingroup Skins
  */
 class SkinDaddio extends SkinTemplate {
-   var $skinname = 'daddio', $stylename = 'daddio',
+   public $skinname = 'daddio', $stylename = 'daddio',
$template = 'DaddioTemplate', $useHeadElement = true;
 
function setupSkinUserCss( OutputPage $out ){
-   global $wgScriptPath;
-
-   $path = {$wgScriptPath}/skins/Daddio;
-
-   // Do not call parent::setupSkinUserCss(), we have our own 
print style
-   $out-addStyle( 'common/shared.css', 'screen' );
-   $out-addStyle( $path/daddio/main.css, 'screen' );
-   $out-addStyle( $path/daddio/print.css, 'print' );
-   $out-addStyle( $path/daddio/rtl.css, 'screen', '', 'rtl' );
+   $out-addModules( 'skin.daddio' );
}
 
 }
@@ -40,6 +32,8 @@
  * @ingroup Skins
  */
 class DaddioTemplate extends ModernTemplate {
+   public $skin;
+
/**
 * Template filter callback for Daddio skin.
 * Takes an associative array of data set from a SkinTemplate-based
@@ -50,9 +44,6 @@
 */
function execute() {
$this-skin = $skin = $this-data['skin'];
-   
-   // Suppress warnings to prevent notices about missing indexes 
in $this-data
-   wfSuppressWarnings();
 
$this-html( 'headelement' );
 
@@ -63,13 +54,13 @@
div id=mw_contentwrapper
!-- navigation portlet --
div class=portlet id=p-cactions
-  h5?php $this-msg('views') ?/h5
+   h5?php $this-msg('views') ?/h5
div class=pBody
ul
?php   foreach($this-data['content_actions'] as $key 
= $tab) { ?
 li id=ca-?php echo 
Sanitizer::escapeId($key) ??php
if($tab['class']) { ? 
class=?php echo htmlspecialchars($tab['class']) ??php }
-?a href=?php echo 
htmlspecialchars($tab['href']) ??php echo 
$skin-tooltipAndAccesskey('ca-'.$key) ??php
+?a href=?php echo 
htmlspecialchars($tab['href']) ??php echo 
$skin-tooltipAndAccesskeyAttribs('ca-'.$key) ??php
 echo htmlspecialchars($tab['text']) 
?/a/li
?php} ?
/ul
@@ -109,7 +100,7 @@
div id=mw_portlets
 
?php 
-   $sidebar = $this-data['sidebar'];  
+   $sidebar = $this-data['sidebar'];
if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true;
if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true;
if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = 
true;
@@ -142,7 +133,7 @@
 ?php  foreach($this-data['personal_urls'] as $key = $item) 
{ ?
li id=pt-?php echo Sanitizer::escapeId($key) 
??php
if ($item['active']) { ? 
class=active?php } ?a

[MediaWiki-commits] [Gerrit] Add extension credits. - change (mediawiki...Daddio)

2014-08-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155761

Change subject: Add extension credits.
..

Add extension credits.

Add extension credits from information found in the class file.

Change-Id: I2f8a4cb20c2173f4a1d336f6a33c65b81a763f1e
---
M Daddio.php
A i18n/en.json
2 files changed, 28 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/61/155761/1

diff --git a/Daddio.php b/Daddio.php
index ef08eeb..adcce67 100644
--- a/Daddio.php
+++ b/Daddio.php
@@ -1,5 +1,26 @@
 ?php
+/**
+ * Daddio skin.
+ *
+ * @file
+ * @ingroup Skins
+ * @author Rufus Post
+ * @author Aaron Schulz
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ *
+ * To install place the Daddio folder (the folder containing this file!) into
+ * skins/ and add this line to your wiki's LocalSettings.php:
+ * require_once($IP/skins/Daddio/Daddio.php);
+ */
+
+$wgExtensionCredits['skin'][] = array(
+   'path' = __FILE__,
+   'name' = 'Daddio',
+   'author' = array( 'Rufus Post', 'Aaron Schulz' ),
+   'description-msg' = 'daddio-desc',
+   'url' = 'https://www.mediawiki.org/wiki/Skin:Daddio',
+);
 
 $wgValidSkinNames['daddio'] = 'Daddio';
 $wgAutoloadClasses['SkinDaddio'] = dirname( __FILE__ ) . /Daddio.class.php;
-
+$wgMessagesDirs['SkinDaddio'] = __DIR__ . '/i18n';
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 000..454d57f
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+daddio-desc: A skin for getting work done.
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/155761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f8a4cb20c2173f4a1d336f6a33c65b81a763f1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Daddio
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove .deps.php file. - change (mediawiki...Daddio)

2014-08-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155764

Change subject: Remove .deps.php file.
..

Remove .deps.php file.

Skin.deps.php files were removed in 1.20 from core skins.

Change-Id: I3151e62a7c4b59d343512037fa725717df8e8556
---
D Daddio.deps.php
1 file changed, 0 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/64/155764/1

diff --git a/Daddio.deps.php b/Daddio.deps.php
deleted file mode 100644
index ba26a05..000
--- a/Daddio.deps.php
+++ /dev/null
@@ -1,13 +0,0 @@
-?php
-// This file exists to ensure that base classes are preloaded before
-// Simple.php is compiled, working around a bug in the APC opcode
-// cache on PHP 5, where cached code can break if the include order
-// changed on a subsequent page view.
-// see http://mail.wikipedia.org/pipermail/wikitech-l/2006-January/033660.html
-
-if ( ! defined( 'MEDIAWIKI' ) )
-   die( 1 );
-
-require_once( dirname( dirname( __FILE__ ) ) . '/includes/SkinTemplate.php');
-require_once( dirname(__FILE__) . '/Daddio.php' );
-

-- 
To view, visit https://gerrit.wikimedia.org/r/155764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3151e62a7c4b59d343512037fa725717df8e8556
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Daddio
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add extension credits. - change (mediawiki...Schulenburg)

2014-08-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155770

Change subject: Add extension credits.
..

Add extension credits.

Change-Id: Id6aeebad3b1987761d9ec6d05ac6a7cb7c43a8d8
---
M Schulenburg.php
1 file changed, 21 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Schulenburg 
refs/changes/70/155770/1

diff --git a/Schulenburg.php b/Schulenburg.php
index 38e455c..9f3e35c 100644
--- a/Schulenburg.php
+++ b/Schulenburg.php
@@ -1,7 +1,26 @@
 ?php
+/**
+ * Schulenburg skin.
+ *
+ * @file
+ * @ingroup Skins
+ * @author Tim Starling
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ *
+ * To install place the Schulenburg folder (the folder containing this file!) 
into
+ * skins/ and add this line to your wiki's LocalSettings.php:
+ * require_once($IP/skins/Schulenburg/Schulenburg.php);
+ */
+
+$wgExtensionCredits['skin'][] = array(
+   'path' = __FILE__,
+   'name' = 'Schulenburg',
+   'author' = 'Tim Starling',
+   'description' = 'Schulenburg',
+   'url' = 'https://www.mediawiki.org/wiki/Skin:Schulenburg',
+);
 
 $wgValidSkinNames['schulenburg'] = 'Schulenburg';
 $wgSkipSkins[] = 'schulenburg';
 $wgSchulenburgSkinPath = false;
-$wgAutoloadClasses['SkinSchulenburg'] = __DIR__ . '/Schulenburg.class.php';
-
+$wgAutoloadClasses['SkinSchulenburg'] = __DIR__ . '/Schulenburg.class.php';
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/155770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6aeebad3b1987761d9ec6d05ac6a7cb7c43a8d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Schulenburg
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make description into a message + URL. - change (mediawiki...p2wiki)

2014-08-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155774

Change subject: Make description into a message + URL.
..

Make description into a message + URL.

Change-Id: I771be3c6d7acbfd8af2feae84b001cd589fb85ad
---
M i18n/en.json
M p2wiki.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/p2wiki 
refs/changes/74/155774/1

diff --git a/i18n/en.json b/i18n/en.json
index 79a71a2..c7a228f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,6 @@
 Daniel Friesen
 ]
 },
+p2wiki-desc: P2 wiki, a wiki skin based on the [http://p2theme.com/ P2] 
WordPress theme.,
 skinname-p2wiki: P2 wiki
-}
+}
\ No newline at end of file
diff --git a/p2wiki.php b/p2wiki.php
index e8ebdf3..9606d89 100644
--- a/p2wiki.php
+++ b/p2wiki.php
@@ -27,8 +27,9 @@
 $wgExtensionCredits['skin'][] = array (
'path' = __FILE__,
'name' = 'P2 wiki',
-   'author' = array('[http://automattic.com/ Automattic]', 
'[http://mediawiki.org/wiki/User:Dantman Daniel Friesen]'),
-   'description' = P2 wiki, a wiki skin based on the 
[http://p2theme.com/ P2] WordPress theme.,
+   'author' = array('[http://automattic.com/ Automattic]', 
'[https://www.mediawiki.org/wiki/User:Dantman Daniel Friesen]'),
+   'description-msg' = 'p2wiki-desc',
+   'url' = 'https://www.mediawiki.org/wiki/Skin:P2 wiki'
 );
 
 $skinID = basename(dirname(__FILE__));

-- 
To view, visit https://gerrit.wikimedia.org/r/155774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I771be3c6d7acbfd8af2feae84b001cd589fb85ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/p2wiki
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove period from description message. - change (mediawiki...Daddio)

2014-08-22 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/155779

Change subject: Remove period from description message.
..

Remove period from description message.

Follow up to I2f8a4cb20c2173f4a1d336f6a33c65b81a763f1e

Change-Id: Iaa3ba0ab02ebcbee1d791be4d89dc28fbdb2b773
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Daddio 
refs/changes/79/155779/1

diff --git a/i18n/en.json b/i18n/en.json
index 7475201..4dfc58b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,5 +2,5 @@
 @metadata: {
 authors: []
 },
-daddio-desc: A skin for getting work done.
+daddio-desc: A skin for getting work done
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/155779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa3ba0ab02ebcbee1d791be4d89dc28fbdb2b773
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Daddio
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add ShoutWiki to the default interwiki list. - change (mediawiki/core)

2014-08-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/152978

Change subject: Add ShoutWiki to the default interwiki list.
..

Add ShoutWiki to the default interwiki list.

Change-Id: I0cfa913c03cd9e0c84e2d25a63c3c44e5a135c6a
---
M maintenance/interwiki.list
M maintenance/interwiki.sql
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/152978/1

diff --git a/maintenance/interwiki.list b/maintenance/interwiki.list
index 8efabef..d97d710 100644
--- a/maintenance/interwiki.list
+++ b/maintenance/interwiki.list
@@ -45,6 +45,7 @@
 s23wiki|http://s23.org/wiki/$1|0
 seattlewireless|http://seattlewireless.net/$1|0
 senseislibrary|http://senseis.xmp.net/?$1|0
+shoutwiki|http://www.shoutwiki.com/wiki/$1|0
 sourceforge|http://sourceforge.net/$1|0
 sourcewatch|http://www.sourcewatch.org/index.php?title=$1|0
 squeak|http://wiki.squeak.org/squeak/$1|0
diff --git a/maintenance/interwiki.sql b/maintenance/interwiki.sql
index 53559ef..7fc033c 100644
--- a/maintenance/interwiki.sql
+++ b/maintenance/interwiki.sql
@@ -47,6 +47,7 @@
 ('s23wiki','http://s23.org/wiki/$1',0),
 ('seattlewireless','http://seattlewireless.net/$1',0),
 ('senseislibrary','http://senseis.xmp.net/?$1',0),
+('shoutwiki','http://www.shoutwiki.com/wiki/$1',0),
 ('sourceforge','http://sourceforge.net/$1',0),
 ('sourcewatch','http://www.sourcewatch.org/index.php?title=$1',0),
 ('squeak','http://wiki.squeak.org/squeak/$1',0),

-- 
To view, visit https://gerrit.wikimedia.org/r/152978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cfa913c03cd9e0c84e2d25a63c3c44e5a135c6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add Uncyclopedia to the default interwiki list. - change (mediawiki/core)

2014-08-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/152986

Change subject: Add Uncyclopedia to the default interwiki list.
..

Add Uncyclopedia to the default interwiki list.

As it's a big project and no longer a Wikia project it can
have it's own entry.

Change-Id: I998d722472fe37ff895648d6d8c7ba131987656d
---
M maintenance/interwiki.list
M maintenance/interwiki.sql
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/152986/1

diff --git a/maintenance/interwiki.list b/maintenance/interwiki.list
index 8efabef..f9e1535 100644
--- a/maintenance/interwiki.list
+++ b/maintenance/interwiki.list
@@ -54,6 +54,7 @@
 theopedia|http://www.theopedia.com/$1|0
 twiki|http://twiki.org/cgi-bin/view/$1|0
 uea|http://uea.org/vikio/index.php/$1|0
+uncyclopedia|http://en.uncyclopedia.co/wiki/$1|0
 unreal|http://wiki.beyondunreal.com/$1|0
 usemod|http://www.usemod.com/cgi-bin/wiki.pl?$1|0
 webseitzwiki|http://webseitz.fluxent.com/wiki/$1|0
diff --git a/maintenance/interwiki.sql b/maintenance/interwiki.sql
index 53559ef..b682d69 100644
--- a/maintenance/interwiki.sql
+++ b/maintenance/interwiki.sql
@@ -56,6 +56,7 @@
 ('theopedia','http://www.theopedia.com/$1',0),
 ('twiki','http://twiki.org/cgi-bin/view/$1',0),
 ('uea','http://uea.org/vikio/index.php/$1',0),
+('uncyclopedia','http://en.uncyclopedia.co/wiki/$1',0),
 ('unreal','http://wiki.beyondunreal.com/$1',0),
 ('usemod','http://www.usemod.com/cgi-bin/wiki.pl?$1',0),
 ('webseitzwiki','http://webseitz.fluxent.com/wiki/$1',0),

-- 
To view, visit https://gerrit.wikimedia.org/r/152986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I998d722472fe37ff895648d6d8c7ba131987656d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Send email from $wgPasswordSender instead of user's email to... - change (mediawiki...InviteSignup)

2014-08-07 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/152231

Change subject: Send email from $wgPasswordSender instead of user's email to 
stop emails going to spam if an SPF record is set. See: 
https://www.mediawiki.org/wiki/Thread:Extension_talk:InviteSignup/Sending_mails_from_users%27_addresses_is_not_a_great_idea
..

Send email from $wgPasswordSender instead of user's email to stop emails going 
to spam if an SPF record is set.
See: 
https://www.mediawiki.org/wiki/Thread:Extension_talk:InviteSignup/Sending_mails_from_users%27_addresses_is_not_a_great_idea

Change-Id: I1d39996697223966a7abbc40713df2aeb9ed3763
---
M SpecialInviteSignup.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InviteSignup 
refs/changes/31/152231/1

diff --git a/SpecialInviteSignup.php b/SpecialInviteSignup.php
index 8ff0e9e..b57d42c 100644
--- a/SpecialInviteSignup.php
+++ b/SpecialInviteSignup.php
@@ -172,6 +172,7 @@
}
 
public static function sendInviteEmail( User $inviter, $email, $hash ) {
+   global $wgPasswordSender;
$url = Title::newFromText( 'Special:Userlogin/signup' 
)-getCanonicalUrl( array( 'invite' = $hash, 'returnto' = 'Special:Dashboard' 
) );
 
$subj = wfMessage( 'is-emailsubj' )-inContentLanguage();
@@ -179,11 +180,10 @@
-params( $inviter-getName(), $url )
-inContentLanguage();
 
-   $emailFrom = new MailAddress( $inviter );
$emailTo = new MailAddress( $email );
$params = array(
'to' = $emailTo,
-   'from' = $emailFrom,
+   'from' = $wgPasswordSender,
'replyto' = $emailFrom,
'body' =  $body-text(),
'subj' = $subj-text(),

-- 
To view, visit https://gerrit.wikimedia.org/r/152231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d39996697223966a7abbc40713df2aeb9ed3763
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InviteSignup
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Push latest copy from ShoutWiki SVN with various updates and... - change (mediawiki...ShoutWikiAds)

2014-08-06 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/152044

Change subject: Push latest copy from ShoutWiki SVN with various updates and 
changes.
..

Push latest copy from ShoutWiki SVN with various updates and changes.

Change-Id: Ib556e644a33ce643f39dcf689d963157a3a9e126
---
M ShoutWikiAds.class.php
M ShoutWikiAds.php
A css/aurora-leaderboard-ad.css
A css/aurora-skyscraper-ad.css
A css/cologneblue-leaderboard-ad.css
A css/home-leaderboard-bottom-ad.css
A css/home-skyscraper-ad.css
A css/modern-button-ad.css
A css/modern-leaderboard-ad.css
M css/monobook-button-ad.css
M css/monobook-skyscraper-ad.css
A css/quartz-square-ad.css
D css/truglass-ads.css
A css/truglass-leaderboard-ad.css
A css/vector-button-ad.css
A css/vector-skyscraper-ad.css
16 files changed, 580 insertions(+), 104 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShoutWikiAds 
refs/changes/44/152044/1

diff --git a/ShoutWikiAds.class.php b/ShoutWikiAds.class.php
index aac4ae9..e2ccb33 100644
--- a/ShoutWikiAds.class.php
+++ b/ShoutWikiAds.class.php
@@ -2,6 +2,7 @@
 /**
  * ShoutWikiAds class -- contains the hooked functions and some other crap for
  * displaying the advertisements.
+ *
  * Route all requests through loadAd( $type ) to ensure correct processing.
  *
  * We allow wiki admins to configure some things because our sane defaults
@@ -20,9 +21,10 @@
/**
 * Can we show ads on the current page?
 *
-* @return bool False if ads aren't enabled or the current page is
-*   Special:UserLogin (login page) or if the user is autoconfirmed and 
the
-*   forceads parameter is NOT in the URL, otherwise true.
+* @return Boolean: false if ads aren't enabled or the current page is
+*  Special:UserLogin (login page) or if the user is
+*  autoconfirmed and the forceads parameter is NOT in 
the
+*  URL, otherwise true
 */
public static function canShowAds() {
global $wgAdConfig, $wgTitle, $wgUser, $wgRequest;
@@ -31,9 +33,8 @@
return false;
}
 
-   list( $alias, /*..*/ ) = SpecialPageFactory::resolveAlias( 
$wgTitle-getDBkey() );
if( $wgTitle instanceof Title 
-   $alias === 'Userlogin' ||
+   $wgTitle-isSpecial( 'Userlogin' ) ||
in_array( 'staff', $wgUser-getEffectiveGroups() )  
!$wgRequest-getVal( 'forceads' )
)
{
@@ -41,7 +42,7 @@
}
 
// No configuration for this skin? Bail out!
-   if ( !$wgAdConfig[self::determineSkin()] ) {
+   if ( !isset( $wgAdConfig[self::determineSkin()] ) ) {
return false;
}
 
@@ -92,13 +93,80 @@
 * @return Boolean: true if the namespace is supported, otherwise false
 */
public static function isEnabledNamespace() {
-   global $wgAdConfig, $wgTitle;
-   $namespace = $wgTitle-getNamespace();
+   global $wgAdConfig;
+   $title = RequestContext::getMain()-getTitle(); // @todo FIXME 
filthy hack
+   $namespace = $title-getNamespace();
if( in_array( $namespace, $wgAdConfig['namespaces'] ) ) {
return true;
} else {
return false;
}
+   }
+
+   /**
+* Skin-agnostic way of getting the HTML for a Google AdSense banner ad.
+*
+* @return String: HTML code
+*/
+   public static function getBannerHTML() {
+   global $wgAdConfig;
+
+   $skinName = self::determineSkin();
+
+   $adSlot = '';
+   if ( isset( $wgAdConfig[$skinName . '-banner-ad-slot'] ) ) {
+   $adSlot = $wgAdConfig[$skinName . '-banner-ad-slot'];
+   }
+
+   $borderColorMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-banner-ad-color-border' )-inContentLanguage();
+   $colorBGMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-banner-ad-color-bg' )-inContentLanguage();
+   $colorLinkMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-banner-ad-color-link' )-inContentLanguage();
+   $colorTextMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-banner-ad-color-text' )-inContentLanguage();
+   $colorURLMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-banner-ad-color-url' )-inContentLanguage();
+
+   $colorBorderDefault = 'F6F4C4';
+   $colorBGDefault = 'E0';
+   $colorLinkDefault = '00';
+   $colorURLDefault = '002BB8';
+
+   // different defaults for Truglass from old Truglass ad code
+   if (

[MediaWiki-commits] [Gerrit] Update from ShoutWiki SVN. - change (mediawiki...Nimbus)

2014-08-06 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/152051

Change subject: Update from ShoutWiki SVN.
..

Update from ShoutWiki SVN.

Change-Id: Idb141e874c605380dd8635e5f12559c04f60d5eb
---
M Nimbus.i18n.php
M Nimbus.skin.php
M nimbus/Menu.js
A nimbus/site_logo.gif
M nimbus/sw_logo.png
5 files changed, 27 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus 
refs/changes/51/152051/1

diff --git a/Nimbus.i18n.php b/Nimbus.i18n.php
index 6e62b30..926b02f 100644
--- a/Nimbus.i18n.php
+++ b/Nimbus.i18n.php
@@ -27,13 +27,6 @@
'nimbus-recent-contributors' = 'Recent contributors to this page',
'nimbus-recent-contributors-info' = 'The following people recently 
contributed to this page.',
'nimbus-signup' = 'Sign up',
-   'nimbus-sidebar' = '* navigation
-** mainpage|mainpage-description
-** portal-url|portal
-** currentevents-url|currentevents
-** recentchanges-url|recentchanges
-** randompage-url|randompage
-** helppage|help',
'nimbus-welcome' = 'Welcome $1',
 );
 
@@ -320,7 +313,6 @@
'nimbus-more-actions' = 'اقدامات بیشتر',
'nimbus-more-wikis' = 'ویکی‌های بیشتر',
'nimbus-profile' = 'نمایه',
-   'nimbus-recent-contributors' = 'مشارکت‌کنندگان اخیر در این صفحه',
'nimbus-signup' = 'ثبت نام',
'nimbus-welcome' = 'خوش آمدی $1',
 );
diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index d93d00c..cefeb06 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -153,18 +153,18 @@
echo \t\t\t . 'div id=login-message' .
wfMessage( 'nimbus-welcome', 'b' . 
$user-getName() . '/b' )-parse() .
'/div
-   a class=positive-button href=' . htmlspecialchars( 
$profile_link-getFullURL() ) . ' rel=nofollowspan' . wfMessage( 
'nimbus-profile' )-plain() . '/span/a
-   a class=negative-button href=' . htmlspecialchars( 
$logout_link-getFullURL() ) . 'span' . wfMessage( 'nimbus-logout' 
)-plain() . '/span/a';
+   a class=positive-button href=' . 
$profile_link-escapeFullURL() . ' rel=nofollowspan' . wfMessage( 
'nimbus-profile' )-plain() . '/span/a
+   a class=negative-button href=' . 
$logout_link-escapeFullURL() . 'span' . wfMessage( 'nimbus-logout' 
)-plain() . '/span/a';
} else {
-   echo 'a class=positive-button href=' . htmlspecialchars( 
$register_link-getFullURL() ) . ' rel=nofollowspan' . wfMessage( 
'nimbus-signup' )-plain() . '/span/a
-   a class=positive-button href=' . htmlspecialchars( 
$login_link-getFullURL() ) . ' id=nimbusLoginButtonspan' . wfMessage( 
'nimbus-login' )-plain() . '/span/a';
+   echo 'a class=positive-button href=' . 
$register_link-escapeFullURL() . ' rel=nofollowspan' . wfMessage( 
'nimbus-signup' )-plain() . '/span/a
+   a class=positive-button href=' . 
$login_link-escapeFullURL() . ' id=nimbusLoginButtonspan' . wfMessage( 
'nimbus-login' )-plain() . '/span/a';
}
 ?
/div!-- #wiki-login --
/div!-- #header --
div id=site-header class=noprint
div id=site-logo
-   a href=?php echo htmlspecialchars( 
$main_page_link-getFullURL() ) ? title=?php echo Linker::titleAttrib( 
'p-logo', 'withaccess' ) ? accesskey=?php echo Linker::accesskey( 'p-logo' 
) ? rel=nofollow
+   a href=?php echo $main_page_link-escapeFullURL() 
? title=?php echo Linker::titleAttrib( 'p-logo', 'withaccess' ) ? 
accesskey=?php echo Linker::accesskey( 'p-logo' ) ? rel=nofollow
img src=?php echo $wgLogo ? alt= /
/a
/div
@@ -187,7 +187,7 @@
?php
// Only show the link to 
Special:TopUsers if wAvatar class exists and $wgUserLevels is an array
if ( class_exists( 'wAvatar' )  
is_array( $wgUserLevels ) ) {
-   echo 'a href=' . 
htmlspecialchars( $top_fans_link-getFullURL() ) . '' . wfMessage( 'topusers' 
)-plain() . '/a';
+   echo 'a href=' . 
$top_fans_link-escapeFullURL() . '' . wfMessage( 'topusers' )-plain() . 
'/a';
}
 
echo Linker::link(
@@ -220,8 +220,8 @@
'div class=cleared/div' . 
\n;
}
?
-   a href=?php echo htmlspecialchars( 
$help_link-getFullURL() ) ??php echo wfMessage( 'help' )-plain() ?/a
-   a href=?php echo htmlspecialchars( 
$special_pages_link-getFullURL() ) ??php

[MediaWiki-commits] [Gerrit] Replace wfMsgHtml with wfMessage calls according to MW.org/w... - change (mediawiki...DPLforum)

2014-08-06 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/152133

Change subject: Replace wfMsgHtml with wfMessage calls according to 
MW.org/wiki/WfMsg
..

Replace wfMsgHtml with wfMessage calls according to MW.org/wiki/WfMsg

Change-Id: I01038951d8227495d88d47dc5b1cf975b50706d5
---
M DPLforum_body.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DPLforum 
refs/changes/33/152133/1

diff --git a/DPLforum_body.php b/DPLforum_body.php
index 6b3d751..be78d3a 100644
--- a/DPLforum_body.php
+++ b/DPLforum_body.php
@@ -522,7 +522,7 @@
if ( $tableMode ) {
if ( $this-bCompactAuthor ) {
if ( $author ) {
-   $byAuthor = wfMsg( 
'word-separator' ) . wfMsgHtml( 'dplforum-by', $author );
+   $byAuthor = wfMsg( 
'word-separator' ) . wfMessage( 'dplforum-by' )-rawParams( $author 
)-escaped();
$output .=  span 
class='forum_author'$byAuthor/span;
} else {
$output .=  span 
class='forum_author'nb . sp;/span;
@@ -531,7 +531,7 @@
$output .= /tdtd 
class='forum_author'$author;
}
} elseif ( $author ) {
-   $byAuthor = wfMsg( 'word-separator' ) . 
wfMsgHtml( 'dplforum-by', $author );
+   $byAuthor = wfMsg( 'word-separator' ) . 
wfMessage( 'dplforum-by' )-rawParams( $author )-escaped();
$output .= $byAuthor;
}
}
@@ -567,7 +567,7 @@
if ( $tableMode ) {
if ( $this-bCompactEdit ) {
if ( $user ) {
-   $byUser = wfMsgHtml( 
'dplforum-by', $user );
+   $byUser = wfMessage( 
'dplforum-by' )-rawParams( $user )-escaped();
$output .=  span 
class='forum_editor'$byUser/span;
} else {
$output .=  span 
class='forum_editor'nb . sp;/span;
@@ -576,7 +576,7 @@
$output .= /tdtd 
class='forum_editor'$user;
}
} elseif ( $user ) {
-   $byUser = wfMsgHtml( 'dplforum-by', $user );
+   $byUser = wfMessage( 'dplforum-by' 
)-rawParams( $user )-escaped();
$text .= $byUser;
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/152133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01038951d8227495d88d47dc5b1cf975b50706d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DPLforum
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Modify access rules - change (mediawiki...GlobalUserPage)

2014-06-04 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/137301

Change subject: Modify access rules
..

Modify access rules
---
M groups
M project.config
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage 
refs/changes/01/137301/1

diff --git a/groups b/groups
index 9e4d0f2..08e7899 100644
--- a/groups
+++ b/groups
@@ -1,3 +1,4 @@
 # UUID Group Name
 #
 4039a650d963c32d8f4e47bb99b9b8b5742c348f   extension-GlobalUserPage
+e840de91aa21e5e32768f44e776c43d4fc1ca729   ShoutWiki
diff --git a/project.config b/project.config
index 54be5c9..9443aab 100644
--- a/project.config
+++ b/project.config
@@ -7,4 +7,5 @@
 [submit]
mergeContent = true
 [access refs/*]
+   owner = group ShoutWiki
owner = group extension-GlobalUserPage

-- 
To view, visit https://gerrit.wikimedia.org/r/137301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76ef3442bb0d4572b046d2e2e5ccb94bd3b86262
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: refs/meta/config
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Initial import of ShoutWiki code. - change (mediawiki...GlobalUserPage)

2014-06-04 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Initial import of ShoutWiki code.
..


Initial import of ShoutWiki code.

Change-Id: I3759363781d0aa51709198ab8480dc16323ff85a
---
A GlobalUserpage.body.php
A GlobalUserpage.hooks.php
A GlobalUserpage.i18n.php
A GlobalUserpage.php
A ext.GlobalUserpage.css
5 files changed, 600 insertions(+), 0 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/GlobalUserpage.body.php b/GlobalUserpage.body.php
new file mode 100644
index 000..fa3a1cb
--- /dev/null
+++ b/GlobalUserpage.body.php
@@ -0,0 +1,104 @@
+?php
+
+class GlobalUserpage {
+
+   static $apiURL = 'http://www.shoutwiki.com/w/api.php';
+
+   /**
+* Makes an API request to ShoutWiki Hub
+*
+* @param $params array
+* @return array
+*/
+   public static function makeAPIRequest( $params ) {
+   $params['format'] = 'json';
+   $url = wfAppendQuery( self::$apiURL, $params );
+   $req = MWHttpRequest::factory( $url );
+   $req-execute();
+   $json = $req-getContent();
+   $decoded = FormatJson::decode( $json, true );
+   return $decoded;
+   }
+
+   /**
+* Get the cache key for a certain title
+*
+* @param Title|string $title
+* @return string
+*/
+   public static function getCacheKey( $title ) {
+   global $wgLanguageCode;
+   return wfMemcKey( 'globaluserpage', $wgLanguageCode, md5( 
$title ), 'v2' );
+   }
+
+   /**
+* Use action=parse to get rendered HTML of a page
+*
+* @param $title string
+* @return array
+*/
+   public static function parseWikiText( $title ) {
+   $params = array(
+   'action' = 'parse',
+   'page' = $title
+   );
+   $data = self::makeAPIRequest( $params );
+   $parsed = $data['parse']['text']['*'];
+   $oldId = $data['parse']['revid'];
+   return array( $parsed, $oldId );
+   }
+
+   /**
+* Get the page text in the content language or a fallback
+*
+* @param $title string page name
+* @return string|bool false if couldn't be found
+*/
+   public static function getPagePlusFallbacks( $title ) {
+   global $wgLanguageCode, $wgMemc, $wgGlobalUserpageCacheExpiry;
+
+   $key = self::getCacheKey( $title );
+   $cached = $wgMemc-get( $key );
+   if ( $cached !== false ) {
+   return $cached;
+   }
+
+   $fallbacks = Language::getFallbacksFor( $wgLanguageCode );
+   array_unshift( $fallbacks, $wgLanguageCode );
+   $titles = array();
+
+   foreach ( $fallbacks as $langCode ) {
+   if ( $langCode === 'en' ) {
+   $titles[$title] = $langCode;
+   } else {
+   $titles[$title . '/' . $langCode] = $langCode;
+   }
+   }
+
+   $params = array(
+   'action' = 'query',
+   'titles' = implode( '|', array_keys( $titles ) )
+   );
+   $data = self::makeAPIRequest( $params );
+   $pages = array();
+
+   foreach ( $data['query']['pages'] as /* $id = */ $info ) {
+   if ( isset( $info['missing'] ) ) {
+   continue;
+   }
+   $lang = $titles[$info['title']];
+   $pages[$lang] = $info['title'];
+   }
+
+   foreach ( $fallbacks as $langCode ) {
+   if ( isset( $pages[$langCode] ) ) {
+   $html = self::parseWikiText( $pages[$langCode] 
);
+   $wgMemc-set( $key, $html, 
$wgGlobalUserpageCacheExpiry );
+   return $html;
+   }
+   }
+
+   return false;
+   }
+
+}
\ No newline at end of file
diff --git a/GlobalUserpage.hooks.php b/GlobalUserpage.hooks.php
new file mode 100644
index 000..31c4f4f
--- /dev/null
+++ b/GlobalUserpage.hooks.php
@@ -0,0 +1,214 @@
+?php
+
+class GlobalUserpageHooks {
+   /**
+* Adds the user option for using GlobalUserpage to Special:Preferences.
+*
+* @param $user User
+* @param $preferences Array: Preference descriptions
+* @return bool
+*/
+   public static function onGetPreferences( $user, $preferences ) {
+   $preferences['globaluserpage'] = array(
+   'type' = 'toggle',
+   'label-message' =

[MediaWiki-commits] [Gerrit] Update default interwiki lists. Remove various links that no... - change (mediawiki/core)

2014-04-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/125778

Change subject: Update default interwiki lists. Remove various links that no 
longer work or seem to point to anywhere it is easy to create an interwiki for. 
Updated various links to use pretty URL or new structures protocols and some to 
point where the new equivalent sit
..

Update default interwiki lists. Remove various links that no longer work or 
seem to point to anywhere it is easy to create an interwiki for. Updated 
various links to use pretty URL or new structures protocols and some to point 
where the new equivalent site is.
Also add ShoutWiki to both lists.

Change-Id: I628ac44e2940ba0b5b1c60eacd3a1e25a9e7e28d
---
M maintenance/interwiki.list
M maintenance/interwiki.sql
2 files changed, 35 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/125778/1

diff --git a/maintenance/interwiki.list b/maintenance/interwiki.list
index 2ad9228..307c196 100644
--- a/maintenance/interwiki.list
+++ b/maintenance/interwiki.list
@@ -2,86 +2,75 @@
 # Default interwiki prefixes...
 acronym|http://www.acronymfinder.com/af-query.asp?String=exactAcronym=$1|0
 advogato|http://www.advogato.org/$1|0
-annotationwiki|http://www.seedwiki.com/page.cfm?wikiid=368doc=$1|0
 arxiv|http://www.arxiv.org/abs/$1|0
 c2find|http://c2.com/cgi/wiki?FindPagevalue=$1|0
 cache|http://www.google.com/search?q=cache:$1|0
 commons|https://commons.wikimedia.org/wiki/$1|0
-corpknowpedia|http://corpknowpedia.org/wiki/index.php/$1|0
 
dictionary|http://www.dict.org/bin/Dict?Database=*Form=Dict1Strategy=*Query=$1|0
 disinfopedia|http://www.disinfopedia.org/wiki.phtml?title=$1|0
 docbook|http://wiki.docbook.org/topic/$1|0
 doi|http://dx.doi.org/$1|0
-drumcorpswiki|http://www.drumcorpswiki.com/index.php/$1|0
+drumcorpswiki|http://www.drumcorpswiki.com/$1|0
 dwjwiki|http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1|0
 elibre|http://enciclopedia.us.es/index.php/$1|0
-emacswiki|http://www.emacswiki.org/cgi-bin/wiki.pl?$1|0
+emacswiki|http://www.emacswiki.org/emacs/$1|0
 foldoc|http://foldoc.org/?$1|0
 foxwiki|http://fox.wikis.com/wc.dll?Wiki~$1|0
 freebsdman|http://www.FreeBSD.org/cgi/man.cgi?apropos=1query=$1|0
 gej|http://www.esperanto.de/cgi-bin/aktivikio/wiki.pl?$1|0
-gentoo-wiki|http://gentoo-wiki.com/$1|0
 google|http://www.google.com/search?q=$1|0
 googlegroups|http://groups.google.com/groups?q=$1|0
 hammondwiki|http://www.dairiki.org/HammondWiki/$1|0
 hewikisource|https://he.wikisource.org/wiki/$1|1
-hrwiki|http://www.hrwiki.org/index.php/$1|0
+hrwiki|http://www.hrwiki.org/wiki/$1|0
 imdb|http://us.imdb.com/Title?$1|0
 jargonfile|http://sunir.org/apps/meta.pl?wiki=JargonFileredirect=$1|0
-jspwiki|http://www.jspwiki.org/wiki/$1|0
-keiki|http://kei.ki/en/$1|0
+jspwiki|https://jspwiki-wiki.apache.org/Wiki.jsp?$1|0
 kmwiki|http://kmwiki.wikispaces.com/$1|0
 linuxwiki|http://linuxwiki.de/$1|0
-lojban|http://www.lojban.org/tiki/tiki-index.php?page=$1|0
+lojban|http://www.lojban.org/tiki/$1|0
 lqwiki|http://wiki.linuxquestions.org/wiki/$1|0
-lugkr|http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?$1|0
-mathsongswiki|http://SeedWiki.com/page.cfm?wikiid=237doc=$1|0
-meatball|http://www.usemod.com/cgi-bin/mb.pl?$1|0
+lugkr|http://www.lug-kr.de/wiki/$1|0
+meatball|http://meatballwiki.org/wiki/$1|0
 mediawikiwiki|https://www.mediawiki.org/wiki/$1|0
 mediazilla|https://bugzilla.wikimedia.org/$1|1
-memoryalpha|http://www.memory-alpha.org/en/index.php/$1|0
+memoryalpha|http://en.memory-alpha.org/wiki/$1|0
 metawiki|http://sunir.org/apps/meta.pl?$1|0
 metawikimedia|https://meta.wikimedia.org/wiki/$1|0
-moinmoin|http://purl.net/wiki/moin/$1|0
-mozillawiki|http://wiki.mozilla.org/index.php/$1|0
+mozillawiki|https://wiki.mozilla.org/$1|0
 mw|https://www.mediawiki.org/wiki/$1|0
-oeis|http://www.research.att.com/cgi-bin/access.cgi/as/njas/sequences/eisA.cgi?Anum=$1|0
-openfacts|http://openfacts.berlios.de/index.phtml?title=$1|0
+openfacts|http://openfacts2.berlios.de/wikien/index.php/$1|0
 openwiki|http://openwiki.com/?$1|0
 # patwiki|http://gauss.ffii.org/$1|0 # 2008-02-27: lots of spambots
-pmeg|http://www.bertilow.com/pmeg/$1.php|0
 ppr|http://c2.com/cgi/wiki?$1|0
 pythoninfo|http://wiki.python.org/moin/$1|0
-rfc|http://www.rfc-editor.org/rfc/rfc$1.txt|0
-s23wiki|http://is-root.de/wiki/index.php/$1|0
+rfc|https://www.rfc-editor.org/rfc/rfc$1.txt|0
+s23wiki|http://s23.org/wiki/$1|0
 seattlewiki|http://seattle.wikia.com/wiki/$1|0
 seattlewireless|http://seattlewireless.net/?$1|0
 senseislibrary|http://senseis.xmp.net/?$1|0
+shoutwiki|http://www.shoutwiki.com/wiki/$1|0
 # slashdot|http://slashdot.org/article.pl?sid=$1|0 # 2008-02-27: update me
 sourceforge|http://sourceforge.net/$1|0
 squeak|http://wiki.squeak.org/squeak/$1|0
 susning|http://www.susning.nu/$1|0
-svgwiki|http://wiki.svg.org/$1|0
-tavi|http://tavi.sourceforge.net/$1|0

[MediaWiki-commits] [Gerrit] Change SVN - Git - change (pywikibot/compat)

2013-11-28 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/98122


Change subject: Change SVN - Git
..

Change SVN - Git

Change-Id: I3ad2a194e1a442da6c3113301a45f8f99a32
---
M generate_family_file.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/22/98122/1

diff --git a/generate_family_file.py b/generate_family_file.py
index 270c26e..cfba6f9 100644
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -163,7 +163,7 @@
   url = %(url)s
   name = %(name)s
 
-Please do not commit this to the SVN repository!
+Please do not commit this to the Git repository!
 \\\
 
 import family

-- 
To view, visit https://gerrit.wikimedia.org/r/98122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ad2a194e1a442da6c3113301a45f8f99a32
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Change delinker.txt documentation to use Git. - change (pywikibot/compat)

2013-11-28 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/98125


Change subject: Change delinker.txt documentation to use Git.
..

Change delinker.txt documentation to use Git.

Change-Id: If8f082edb82af947e1db7fa0072ae9ce6a15d09e
---
M commonsdelinker/delinker.txt
1 file changed, 3 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/25/98125/1

diff --git a/commonsdelinker/delinker.txt b/commonsdelinker/delinker.txt
index 81eb8ca..a96979b 100644
--- a/commonsdelinker/delinker.txt
+++ b/commonsdelinker/delinker.txt
@@ -49,7 +49,7 @@
 in plugins.txt.
 
 == Requirements ==
-* A recent SVN checkout of the pywikipedia framework
+* A recent Git clone of the pywikipedia framework
 * Python 2.4 or higher
 * A MySQL database and the MySQLdb api for Python, version 1.2.1_p or higher
 ** In the future, probably also sqlite3 will be supported.
@@ -215,9 +215,8 @@
  OTHER DEALINGS IN THE SOFTWARE.
  
 The most recent version of this documentation can be found in the 
-pywikipedia SVN, on http://svn.wikimedia.org/svnroot/pywikipedia/
-trunk/pywikipedia/ and browsable on http://svn.wikimedia.org/viewvc/
-pywikipedia/. Copies maybe found on meta http://meta.wikimedia.org/
+pywikipedia Git, https://git.wikimedia.org/summary/
+pywikibot%2Fcompat.git. Copies maybe found on meta http://meta.wikimedia.org/
 wiki/CommonsDelinker/For_operators and BotWiki http://botwiki.sno.cc/
 wiki/Python:CommonsDelinker/For_operators.
   

-- 
To view, visit https://gerrit.wikimedia.org/r/98125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8f082edb82af947e1db7fa0072ae9ce6a15d09e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add ResourceLoader support. - change (mediawiki...RandomUsersWithAvatars)

2013-09-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/83367


Change subject: Add ResourceLoader support.
..

Add ResourceLoader support.

Change-Id: I2b6705a68e4b748cf696c7029579332e6a397a13
---
A ext.randomuserswithavatars.css
1 file changed, 18 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomUsersWithAvatars 
refs/changes/67/83367/1

diff --git a/ext.randomuserswithavatars.css b/ext.randomuserswithavatars.css
new file mode 100644
index 000..4c2ad57
--- /dev/null
+++ b/ext.randomuserswithavatars.css
@@ -0,0 +1,18 @@
+.random-users-avatars {
+   padding: 0px 0px 0px 10px;
+}
+
+.random-users-avatars h2 {
+   border-bottom: none;
+   margin: 0px 0px 0px 0px;
+   padding: 7px 0px 8px 0px;
+}
+
+.random-users-avatars img {
+   border: 1px solid #DCDCDC;
+   display: block;
+   float: left;
+   height: 50px;
+   margin: 0px 8px 8px 0px;
+   width: 50px;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/83367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b6705a68e4b748cf696c7029579332e6a397a13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing PHP file changes. - change (mediawiki...RandomUsersWithAvatars)

2013-09-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/83368


Change subject: Add missing PHP file changes.
..

Add missing PHP file changes.

Change-Id: Ic73489d9aa361745f194e504b232789fbfe2
---
M RandomUsersWithAvatars.php
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomUsersWithAvatars 
refs/changes/68/83368/1

diff --git a/RandomUsersWithAvatars.php b/RandomUsersWithAvatars.php
index 9fbd44a..9e9674d 100644
--- a/RandomUsersWithAvatars.php
+++ b/RandomUsersWithAvatars.php
@@ -34,6 +34,11 @@
 // Internationalization messages
 $dir = dirname( __FILE__ ) . '/';
 $wgExtensionMessagesFiles['RandomUsersWithAvatars'] = $dir . 
'RandomUsersWithAvatars.i18n.php';
+$wgResourceModules['ext.randomuserswithavatars'] = array(
+'styles' = 'ext.randomuserswithavatars.css',
+'localBasePath' = dirname(__FILE__),
+'remoteExtPath' = 'RandomUsersWithAvatars'
+);
 
 $wgHooks['ParserFirstCallInit'][] = 'wfRandomUsersWithAvatars';
 function wfRandomUsersWithAvatars( $parser ) {
@@ -42,11 +47,12 @@
 }
 
 function GetRandomUsersWithAvatars( $input, $args, $parser ) {
-   global $wgUploadDirectory, $wgDBname, $wgMemc;
-   
+   global $wgUploadDirectory, $wgDBname, $wgMemc, $wgOut;
 
wfProfileIn( __METHOD__ );
 
+   $wgOut-addModuleStyles( 'ext.randomuserswithavatars' );
+
$parser-disableCache();
 
$count = ( isset( $args['count'] )  is_numeric( $args['count'] ) ) ? 
intval( $args['count'] ) : 10;

-- 
To view, visit https://gerrit.wikimedia.org/r/83368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic73489d9aa361745f194e504b232789fbfe2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing commas. - change (mediawiki...RandomUsersWithAvatars)

2013-09-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/83373


Change subject: Add missing commas.
..

Add missing commas.

Change-Id: I707189e90d59a1d178ca851e5532168337c87b6a
---
M RandomUsersWithAvatars.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomUsersWithAvatars 
refs/changes/73/83373/1

diff --git a/RandomUsersWithAvatars.php b/RandomUsersWithAvatars.php
index c6a24b5..ffcd135 100644
--- a/RandomUsersWithAvatars.php
+++ b/RandomUsersWithAvatars.php
@@ -37,8 +37,8 @@
 $wgResourceModules['ext.randomuserswithavatars'] = array(
'styles' = 'ext.randomuserswithavatars.css',
'localBasePath' = dirname(__FILE__),
-   'remoteExtPath' = 'RandomUsersWithAvatars'
-   'position' = 'top'
+   'remoteExtPath' = 'RandomUsersWithAvatars',
+   'position' = 'top',
 );
 
 $wgHooks['ParserFirstCallInit'][] = 'wfRandomUsersWithAvatars';

-- 
To view, visit https://gerrit.wikimedia.org/r/83373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I707189e90d59a1d178ca851e5532168337c87b6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing commas. - change (mediawiki...RandomUsersWithAvatars)

2013-09-08 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Add missing commas.
..


Add missing commas.

Change-Id: I707189e90d59a1d178ca851e5532168337c87b6a
---
M RandomUsersWithAvatars.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/RandomUsersWithAvatars.php b/RandomUsersWithAvatars.php
index c6a24b5..ffcd135 100644
--- a/RandomUsersWithAvatars.php
+++ b/RandomUsersWithAvatars.php
@@ -37,8 +37,8 @@
 $wgResourceModules['ext.randomuserswithavatars'] = array(
'styles' = 'ext.randomuserswithavatars.css',
'localBasePath' = dirname(__FILE__),
-   'remoteExtPath' = 'RandomUsersWithAvatars'
-   'position' = 'top'
+   'remoteExtPath' = 'RandomUsersWithAvatars',
+   'position' = 'top',
 );
 
 $wgHooks['ParserFirstCallInit'][] = 'wfRandomUsersWithAvatars';

-- 
To view, visit https://gerrit.wikimedia.org/r/83373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I707189e90d59a1d178ca851e5532168337c87b6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Push version 0.3.3 upstream from ShoutWiki's repository. - change (mediawiki...ShoutWikiAds)

2013-07-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/75577


Change subject: Push version 0.3.3 upstream from ShoutWiki's repository.
..

Push version 0.3.3 upstream from ShoutWiki's repository.

Change-Id: Ibf1614bb554c20bb986a368f3b1678588eee87a1
---
M ShoutWikiAds.class.php
M ShoutWikiAds.php
2 files changed, 458 insertions(+), 107 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShoutWikiAds 
refs/changes/77/75577/1

diff --git a/ShoutWikiAds.class.php b/ShoutWikiAds.class.php
index 39b9a0d..1c6986d 100644
--- a/ShoutWikiAds.class.php
+++ b/ShoutWikiAds.class.php
@@ -6,8 +6,8 @@
  *
  * We allow wiki admins to configure some things because our sane defaults
  * may clash with certain CSS styles (dark wikis, for example).
- * wfMsgForContent() is used because CSS is global (doesn't vary depending on
- * the user's language).
+ * The Message objects are called with -inContentLanguage(), because CSS is
+ * global (doesn't vary depending on the user's language).
  *
  * All class methods are public and static.
  *
@@ -34,9 +34,14 @@
 
if( $wgTitle instanceof Title 
SpecialPage::resolveAlias( $wgTitle-getDBkey() 
) == 'Userlogin' ||
-   $wgUser-isAllowed( 'autoconfirmed' )  
!$wgRequest-getVal( 'forceads' )
+   in_array( 'staff', $wgUser-getEffectiveGroups() )  
!$wgRequest-getVal( 'forceads' )
)
{
+   return false;
+   }
+
+   // No configuration for this skin? Bail out!
+   if ( !$wgAdConfig[self::determineSkin()] ) {
return false;
}
 
@@ -103,7 +108,7 @@
 * @return String: HTML code
 */
public static function getSidebarHTML() {
-   global $wgAdConfig, $wgUser;
+   global $wgAdConfig;
 
$skinName = 'monaco';
$id = {$skinName}-sidebar-ad;
@@ -112,13 +117,7 @@
// as Monobook cannot support this type of ad (Monobook has 
right
// column and toolbox ads only)
/*
-   $skinObj = $wgUser-getSkin();
-   $skinName = 'monobook'; // sane default
-   if ( get_class( $skinObj ) == 'SkinMonaco' ) {
-   $skinName = 'monaco';
-   } elseif ( get_class( $skinObj ) == 'SkinMonoBook' ) {
-   $skinName = 'monobook';
-   }
+   $skinName = self::determineSkin();
 
$id = {$skinName}-sidebar-ad;
$classes = {$skinName}-ad noprint;
@@ -132,20 +131,40 @@
}
*/
 
+   $adSlot = '';
+   if ( isset( $wgAdConfig[$skinName . '-small-square-ad-slot'] ) 
) {
+   $adSlot = $wgAdConfig[$skinName . 
'-small-square-ad-slot'];
+   }
+
+   $borderColorMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-border' )-inContentLanguage();
+   $colorBGMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-bg' )-inContentLanguage();
+   $colorLinkMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-link' )-inContentLanguage();
+   $colorTextMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-text' )-inContentLanguage();
+   $colorURLMsg = wfMessage( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-url' )-inContentLanguage();
+
+   if ( $wgAdConfig['debug'] === true ) {
+   return '!-- Begin sidebar ad (ShoutWikiAds) --
+   div id=' . $id . ' class=' . $classes . '
+   img 
src=http://www.google.com/help/hc/images/adsense_185665_adformat-text_200x200.png;
 alt= /
+   /div
+!-- End sidebar ad (ShoutWikiAds) --' . \n;
+   }
+
return '!-- Begin sidebar ad (ShoutWikiAds) --
div id=' . $id . ' class=' . $classes . '
 script type=text/javascript!--
 google_ad_client = pub-' . $wgAdConfig['adsense-client'] . ';
+google_ad_slot = ' . $adSlot . ';
 google_ad_width = 200;
 google_ad_height = 200;
 google_ad_format = 200x200_as;
 google_ad_type = text;
 google_ad_channel = ;
-google_color_border = ' . ( !wfEmptyMsg( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-border', wfMsgForContent( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-border' ) ) ? wfMsgForContent( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-border' ) : 'F6F4C4' ) . ';
-google_color_bg = ' . ( !wfEmptyMsg( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-bg', wfMsgForContent( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-bg' ) ) ? wfMsgForContent( 'shoutwiki-' . $skinName . 
'-sidebar-ad-color-bg' ) : 'E0' ) . ';
-google_color_link = ' . ( !wfEmptyMsg( 'shoutwiki-' . $skinName .

[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...Nimbus)

2013-07-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/75782


Change subject: Add .gitreview
..

Add .gitreview

Change-Id: I9f3a2398c409c6b1c6feed4860cf1c79ac7aff8c
---
A .gitreview
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus 
refs/changes/82/75782/1

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..b75c60a
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,7 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/skins/Nimbus
+defaultbranch=master
+defaultrebase=0
+

-- 
To view, visit https://gerrit.wikimedia.org/r/75782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f3a2398c409c6b1c6feed4860cf1c79ac7aff8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...Nimbus)

2013-07-24 Thread Lewis Cawte (Code Review) 
Lewis Cawte has submitted this change and it was merged.

Change subject: Add .gitreview
..


Add .gitreview

Change-Id: I9f3a2398c409c6b1c6feed4860cf1c79ac7aff8c
---
A .gitreview
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..b75c60a
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,7 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/skins/Nimbus
+defaultbranch=master
+defaultrebase=0
+

-- 
To view, visit https://gerrit.wikimedia.org/r/75782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f3a2398c409c6b1c6feed4860cf1c79ac7aff8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me
Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Change HTTPS links to www per Nikerabbit's comment on I203f5... - change (mediawiki...SidebarDonateBox)

2013-06-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68688


Change subject: Change HTTPS links to www per Nikerabbit's comment on 
I203f553f0cac1d0b18d9d46980816038caa00b16.
..

Change HTTPS links to www per Nikerabbit's comment on 
I203f553f0cac1d0b18d9d46980816038caa00b16.

Change-Id: Ie10c25b640bf912064e18f4747cafe466a52c80c
---
M SidebarDonateBox.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SidebarDonateBox 
refs/changes/88/68688/1

diff --git a/SidebarDonateBox.php b/SidebarDonateBox.php
index 5b0b074..0fb3591 100644
--- a/SidebarDonateBox.php
+++ b/SidebarDonateBox.php
@@ -27,9 +27,9 @@
 $wgExtensionCredits['parserhook'][] = array (
'path' = __FILE__,
'name' = 'SidebarDonateBox',
-   'url' = 'https://mediawiki.org/wiki/Extension:SidebarDonateBox',
+   'url' = 'https://www.mediawiki.org/wiki/Extension:SidebarDonateBox',
'version' = '1.1a',
-   'author' = [https://mediawiki.org/wiki/User:Dantman Daniel Friesen],
+   'author' = [https://www.mediawiki.org/wiki/User:Dantman Daniel 
Friesen],
'descriptionmsg' = 'sidebardonatebox-desc',
 );
 // Internationalization file

-- 
To view, visit https://gerrit.wikimedia.org/r/68688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie10c25b640bf912064e18f4747cafe466a52c80c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SidebarDonateBox
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Change URL to https://www.mediawiki.org as https://mediawiki... - change (mediawiki...FeaturedFeeds)

2013-06-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68689


Change subject: Change URL to https://www.mediawiki.org as 
https://mediawiki.org redirects to HTTP.
..

Change URL to https://www.mediawiki.org as https://mediawiki.org redirects to 
HTTP.

Change-Id: I0cb7010a2555782787095143ba85d4af7a9a2a8a
---
M FeaturedFeeds.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FeaturedFeeds 
refs/changes/89/68689/1

diff --git a/FeaturedFeeds.php b/FeaturedFeeds.php
index d3175e6..6d0e132 100644
--- a/FeaturedFeeds.php
+++ b/FeaturedFeeds.php
@@ -12,7 +12,7 @@
'path' = __FILE__,
'name' = 'FeaturedFeeds',
'author' = array( 'Max Semenik' ),
-   'url' = 'https://mediawiki.org/wiki/Extension:FeaturedFeeds',
+   'url' = 'https://www.mediawiki.org/wiki/Extension:FeaturedFeeds',
'descriptionmsg' = 'ffeed-desc',
 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/68689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cb7010a2555782787095143ba85d4af7a9a2a8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FeaturedFeeds
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] HTTPS MediaWiki.org redirects to HTTP, so changing to WWW. - change (mediawiki...Gadgets)

2013-06-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68692


Change subject: HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.
..

HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.

Change-Id: Iffbb3751753b211221728fa890e2c82e94f0150e
---
M Gadgets.php
M README
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets 
refs/changes/92/68692/1

diff --git a/Gadgets.php b/Gadgets.php
index 59b0af6..e77fe7c 100644
--- a/Gadgets.php
+++ b/Gadgets.php
@@ -24,7 +24,7 @@
'path' = __FILE__,
'name' = 'Gadgets',
'author' = array( 'Daniel Kinzler', 'Max Semenik' ),
-   'url' = 'https://mediawiki.org/wiki/Extension:Gadgets',
+   'url' = 'https://www.mediawiki.org/wiki/Extension:Gadgets',
'descriptionmsg' = 'gadgets-desc',
 );
 
diff --git a/README b/README
index cbe0862..5fb3c35 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@
 The Gadgets extension provides a way for users to pick JavaScript or CSS
 based gadgets that other wiki users provide.
 
-https://mediawiki.org/wiki/Extension:Gadgets
+https://www.mediawiki.org/wiki/Extension:Gadgets
 
 The Gadgets extension was originally written by Daniel Kinzler in 2007
 and is released under the GNU General Public Licence (GPL).

-- 
To view, visit https://gerrit.wikimedia.org/r/68692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffbb3751753b211221728fa890e2c82e94f0150e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] HTTPS MediaWiki.org redirects to HTTP, so changing to WWW. - change (mediawiki...GeoData)

2013-06-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68693


Change subject: HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.
..

HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.

Change-Id: I0cc4970fc34efa769ca1b7a358b526ba3682e4b1
---
M GeoData.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData 
refs/changes/93/68693/1

diff --git a/GeoData.php b/GeoData.php
index eb10f01..fc9eac6 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -7,7 +7,7 @@
'path' = __FILE__,
'name' = 'GeoData',
'author' = array( 'Max Semenik' ),
-   'url' = 'https://mediawiki.org/wiki/Extension:GeoData',
+   'url' = 'https://www.mediawiki.org/wiki/Extension:GeoData',
'descriptionmsg' = 'geodata-desc',
 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/68693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cc4970fc34efa769ca1b7a358b526ba3682e4b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] HTTPS MediaWiki.org redirects to HTTP, so changing to WWW. - change (mediawiki...Solarium)

2013-06-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68695


Change subject: HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.
..

HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.

Change-Id: I830131f6f311cefb5b0b29c5381a943ce550f530
---
M Solarium.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Solarium 
refs/changes/95/68695/1

diff --git a/Solarium.php b/Solarium.php
index 938ba44..29c73de 100644
--- a/Solarium.php
+++ b/Solarium.php
@@ -39,7 +39,7 @@
'path' = __FILE__,
'name' = 'Solarium',
'author' = 'Max Semenik',
-   'url' = 'https://mediawiki.org/wiki/Extension:Solarium',
+   'url' = 'https://www.mediawiki.org/wiki/Extension:Solarium',
'version' = '2.4.1', // Yes, lib/Version.php says 2.4.0, but it wasn't 
updated for 2.4.1
'descriptionmsg' = 'solarium-desc',
 );

-- 
To view, visit https://gerrit.wikimedia.org/r/68695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I830131f6f311cefb5b0b29c5381a943ce550f530
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Solarium
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] HTTPS MediaWiki.org redirects to HTTP, so changing to WWW. - change (mediawiki...ApiSandbox)

2013-06-14 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68713


Change subject: HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.
..

HTTPS MediaWiki.org redirects to HTTP, so changing to WWW.

Change-Id: Ia70117a2e6d474cdca781de4980da76cdd0257b0
---
M ApiSandbox.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiSandbox 
refs/changes/13/68713/1

diff --git a/ApiSandbox.php b/ApiSandbox.php
index d2cdb0a..456b69d 100644
--- a/ApiSandbox.php
+++ b/ApiSandbox.php
@@ -7,7 +7,7 @@
'path' = __FILE__,
'name' = 'ApiSandbox',
'author' = array( 'Max Semenik' ),
-   'url' = 'https://mediawiki.org/wiki/Extension:ApiSandbox',
+   'url' = 'https://www.mediawiki.org/wiki/Extension:ApiSandbox',
'descriptionmsg' = 'apisb-desc',
 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/68713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia70117a2e6d474cdca781de4980da76cdd0257b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Change MediaWiki.org links from HTTP to HTTPS. - change (mediawiki...SidebarDonateBox)

2013-06-13 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/68549


Change subject: Change MediaWiki.org links from HTTP to HTTPS.
..

Change MediaWiki.org links from HTTP to HTTPS.

Change-Id: I203f553f0cac1d0b18d9d46980816038caa00b16
---
M SidebarDonateBox.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SidebarDonateBox 
refs/changes/49/68549/1

diff --git a/SidebarDonateBox.php b/SidebarDonateBox.php
index 7b5932d..5b0b074 100644
--- a/SidebarDonateBox.php
+++ b/SidebarDonateBox.php
@@ -27,9 +27,9 @@
 $wgExtensionCredits['parserhook'][] = array (
'path' = __FILE__,
'name' = 'SidebarDonateBox',
-   'url' = 'http://mediawiki.org/wiki/Extension:SidebarDonateBox',
+   'url' = 'https://mediawiki.org/wiki/Extension:SidebarDonateBox',
'version' = '1.1a',
-   'author' = [http://mediawiki.org/wiki/User:Dantman Daniel Friesen],
+   'author' = [https://mediawiki.org/wiki/User:Dantman Daniel Friesen],
'descriptionmsg' = 'sidebardonatebox-desc',
 );
 // Internationalization file

-- 
To view, visit https://gerrit.wikimedia.org/r/68549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I203f553f0cac1d0b18d9d46980816038caa00b16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SidebarDonateBox
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update Extension Distributor messaging for 1.21 stable release. - change (mediawiki...WikimediaMessages)

2013-06-07 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67528


Change subject: Update Extension Distributor messaging for 1.21 stable release.
..

Update Extension Distributor messaging for 1.21 stable release.

Change-Id: Iacaa1c950c7f6034c4fac661bb87647a3ed96b86
---
M WikimediaMessages.i18n.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages 
refs/changes/28/67528/1

diff --git a/WikimediaMessages.i18n.php b/WikimediaMessages.i18n.php
index da4ab4e..c31c809 100644
--- a/WikimediaMessages.i18n.php
+++ b/WikimediaMessages.i18n.php
@@ -240,7 +240,8 @@
 
# Extension distributor messages for mediawiki.org
'extdist-branch-master' = 'master (latest development version)',
-   'extdist-branch-REL1_20' = '1.20 (latest stable MediaWiki)',
+   'extdist-branch-REL1_21' = '1.21 (latest stable MediaWiki)',
+   'extdist-branch-REL1_20' = '1.20',
'extdist-branch-REL1_19' = '1.19',
 
# Links in new vertical-layout login and create account forms

-- 
To view, visit https://gerrit.wikimedia.org/r/67528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacaa1c950c7f6034c4fac661bb87647a3ed96b86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.me

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add additional newer language codes. - change (mediawiki...ShoutWikiAds)

2013-05-28 Thread Lewis Cawte (Code Review) 
Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/65783


Change subject: Add additional newer language codes.
..

Add additional newer language codes.

Change-Id: Icaf9dbdd22a02b34d8407a7ec0efd3f1bf386943
---
M ShoutWikiAds.class.php
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShoutWikiAds 
refs/changes/83/65783/1

diff --git a/ShoutWikiAds.class.php b/ShoutWikiAds.class.php
index 4777bd3..39b9a0d 100644
--- a/ShoutWikiAds.class.php
+++ b/ShoutWikiAds.class.php
@@ -65,7 +65,13 @@
// Portuguese - Turkish
'pt', 'ro', 'ru', 'sr', 'sr-ec', 'sk', 'es', 'sv', 
'th', 'tr',
// 
http://adsense.blogspot.com/2009/08/adsense-launched-in-lithuanian.html
-   'lt', 'lv', 'uk'
+   'lt', 'lv', 'uk',
+   // Vietnamese 
http://adsense.blogspot.co.uk/2013/05/adsense-now-speaks-vietnamese.html
+   'vi',
+   // Slovenian  Estonian 
http://adsense.blogspot.co.uk/2012/06/adsense-now-available-for-websites-in.html
+   'sl', 'et',
+   // Indonesian 
http://adsense.blogspot.co.uk/2012/02/adsense-now-speaks-indonesian.html
+   'id',
);
 
if( in_array( $wgLanguageCode, $supportedAdLanguages ) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/65783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaf9dbdd22a02b34d8407a7ec0efd3f1bf386943
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ShoutWikiAds
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte le...@lewiscawte.info

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits