[MediaWiki-commits] [Gerrit] Add some profiling for bug 53748 - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Add some profiling for bug 53748
..

Add some profiling for bug 53748

https://mingle.corp.wikimedia.org/projects/internationalization/cards/3854

Change-Id: I52e96e7700f67a42231f5bff183b07b3375c02de
---
M api/ApiQueryMessageGroups.php
1 file changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index e95171d..4fe23ac 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -104,10 +104,13 @@
$subgroups = $mixed;
}
 
+   wfProfileIn( __METHOD__ . '-' . get_class( $g ) );
+
$a = array();
 
$groupId = $g-getId();
 
+   wfProfileIn( __METHOD__ . '-basic' );
if ( isset( $props['id'] ) ) {
$a['id'] = $groupId;
}
@@ -127,18 +130,24 @@
if ( isset( $props['namespace'] ) ) {
$a['namespace'] = $g-getNamespace();
}
+   wfProfileOut( __METHOD__ . '-basic' );
 
+   wfProfileIn( __METHOD__ . '-exists' );
if ( isset( $props['exists'] ) ) {
$a['exists'] = $g-exists();
}
+   wfProfileOut( __METHOD__ . '-exists' );
 
+   wfProfileIn( __METHOD__ . '-icon' );
if ( isset( $props['icon'] ) ) {
$formats = TranslateUtils::getIcon( $g, 
$params['iconsize'] );
if ( $formats ) {
$a['icon'] = $formats;
}
}
+   wfProfileOut( __METHOD__ . '-icon' );
 
+   wfProfileIn( __METHOD__ . '-priority' );
if ( isset( $props['priority'] ) ) {
$priority = MessageGroups::getPriority( $g );
$a['priority'] = $priority ? : 'default';
@@ -152,16 +161,21 @@
if ( isset( $props['priorityforce'] ) ) {
$a['priorityforce'] = ( TranslateMetadata::get( 
$groupId, 'priorityforce' ) === 'on' );
}
+   wfProfileOut( __METHOD__ . '-priority' );
 
+   wfProfileIn( __METHOD__ . '-workflowstates' );
if ( isset( $props['workflowstates'] ) ) {
$a['workflowstates'] = $this-getWorkflowStates( $g );
}
+   wfProfileOut( __METHOD__ . '-workflowstates' );
 
wfRunHooks(
'TranslateProcessAPIMessageGroupsProperties',
array( $a, $props, $params, $g )
);
 
+   wfProfileOut( __METHOD__ . '-' . get_class( $g ) );
+
// Depth only applies to tree format
if ( $depth = $params['depth']  $params['format'] === 'tree' 
) {
$a['groupcount'] = count( $subgroups );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e96e7700f67a42231f5bff183b07b3375c02de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Autonym font is applied only to language links - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Autonym font is applied only to language links
..


Autonym font is applied only to language links

Broken test in cloudbees: http://goo.gl/G3EG3z

Bug: 56819

Change-Id: I734fe4835f6e7a44b446cd826e49086d6bd1bd5b
---
M tests/browser/features/support/modules/interlanguage_module.rb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/features/support/modules/interlanguage_module.rb 
b/tests/browser/features/support/modules/interlanguage_module.rb
index 4df45d7..5c9685b 100644
--- a/tests/browser/features/support/modules/interlanguage_module.rb
+++ b/tests/browser/features/support/modules/interlanguage_module.rb
@@ -19,5 +19,5 @@
   span(:x, id: 'languagesettings-close')
   a(:how_to_use_ml_transliteration, href: 
'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:UniversalLanguageSelector/Input_methods/ml-transliteration')
   a(:edit_link, css: '#ca-edit a')
-  a(:interlang_link, css: '#p-lang ul')
+  a(:interlang_link, css: '#p-lang li.interlanguage-link')
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I734fe4835f6e7a44b446cd826e49086d6bd1bd5b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Check that elements that do not need it do not use Autonym font - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Check that elements that do not need it do not use Autonym font
..


Check that elements that do not need it do not use Autonym font

Change-Id: I2a865d61403b5556a8f6d69aa1fe3e10727e87ae
---
M tests/browser/features/autonym.feature
M tests/browser/features/step_definitions/autonym_steps.rb
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/support/pages/interlanguage_page.rb
A tests/browser/features/support/pages/main_page.rb
5 files changed, 33 insertions(+), 12 deletions(-)

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



diff --git a/tests/browser/features/autonym.feature 
b/tests/browser/features/autonym.feature
index fd4d9ca..34b39b6 100644
--- a/tests/browser/features/autonym.feature
+++ b/tests/browser/features/autonym.feature
@@ -21,11 +21,11 @@
 When I click the button with the ellipsis
 Then the language list of ULS should use Autonym font
 
-  @login @en.wikipedia.beta.wmflabs.org
-  Scenario: Autonym font should be used in the Interlanguage area of a page 
with Interlanguage links
-Given I am logged in
-When I am on a page with interlanguage links
-Then the Interlanguage area should use Autonym font
+  @en.wikipedia.beta.wmflabs.org
+  Scenario: Autonym font should be used in the Interlanguage area of a page 
only with Interlanguage links
+When I am on the main page
+Then the Interlanguage links should use Autonym font
+  And elements that are not Interlanguage links should not use Autonym font
 
   @anon-language-selection @commons.wikimedia.beta.wmflabs.org
   Scenario: Autonym font is used in the ULS language search dialog for input 
language selection by anonymous users
diff --git a/tests/browser/features/step_definitions/autonym_steps.rb 
b/tests/browser/features/step_definitions/autonym_steps.rb
index 4a8bebc..9724f54 100644
--- a/tests/browser/features/step_definitions/autonym_steps.rb
+++ b/tests/browser/features/step_definitions/autonym_steps.rb
@@ -1,7 +1,19 @@
+When(/^I am on the main page$/) do
+   visit MainPage
+end
+
 Then(/^I open Input panel of language settings$/) do
-  on(PanelPage).panel_input_element.when_visible.click
+   on(PanelPage).panel_input_element.when_visible.click
 end
 
 Then(/^I open Input side panel of language settings$/) do
-  on(PanelPage).panel_side_input_element.when_visible.click
+   on(PanelPage).panel_side_input_element.when_visible.click
+end
+
+Then(/^the Interlanguage links should use Autonym font$/) do
+   
on(InterlanguagePage).interlang_link_element.style(font-family).should == 
'Autonym',sans-serif
+end
+
+Then(/^elements that are not Interlanguage links should not use Autonym 
font$/) do
+   on(MainPage).non_interlanguage_links_use_autonym_font?.should == false
 end
diff --git a/tests/browser/features/step_definitions/panel_steps.rb 
b/tests/browser/features/step_definitions/panel_steps.rb
index 395cc3e..927d2ef 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -76,10 +76,6 @@
on(PanelPage).autonym_element.style(font-family).should == 
'Autonym',sans-serif
 end
 
-Then(/^the Interlanguage area should use Autonym font$/) do
-   
on(InterlanguagePage).interlang_link_element.style(font-family).should == 
'Autonym',sans-serif
-end
-
 Then(/^I should see (.*) as the selected input language$/) do |language|
on(PanelPage).default_language_button_element.text.should == language
 end
diff --git a/tests/browser/features/support/pages/interlanguage_page.rb 
b/tests/browser/features/support/pages/interlanguage_page.rb
index 9da2645..7e3e451 100644
--- a/tests/browser/features/support/pages/interlanguage_page.rb
+++ b/tests/browser/features/support/pages/interlanguage_page.rb
@@ -1,5 +1,6 @@
 class InterlanguagePage
   include PageObject
+  include InterlanguagePageModule
 
   include URL
   def self.url
@@ -7,5 +8,5 @@
   end
   page_url url
 
-  include InterlanguagePageModule
 end
+
diff --git a/tests/browser/features/support/pages/main_page.rb 
b/tests/browser/features/support/pages/main_page.rb
new file mode 100644
index 000..fce8e55
--- /dev/null
+++ b/tests/browser/features/support/pages/main_page.rb
@@ -0,0 +1,12 @@
+class MainPage
+   include PageObject
+
+   include URL
+   page_url URL.url('Main_Page')
+
+   def non_interlanguage_links_use_autonym_font?
+   @browser.elements(css: '#p-lang 
li:not(.interlanguage-link)').collect do |element|
+   element.style(font-family)
+   end.to_s.match(/Autonym/) != nil
+   end
+end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a865d61403b5556a8f6d69aa1fe3e10727e87ae

[MediaWiki-commits] [Gerrit] Remove unneeded () for visit - change (mediawiki...UniversalLanguageSelector)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Remove unneeded () for visit
..

Remove unneeded () for visit

Change-Id: I34cccf69812be6e060d3f1dea1199da668e2ca31
---
M tests/browser/features/step_definitions/accept_language_steps.rb
M tests/browser/features/step_definitions/ime_steps.rb
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb 
b/tests/browser/features/step_definitions/accept_language_steps.rb
index b1b7dba..3ae88a2 100644
--- a/tests/browser/features/step_definitions/accept_language_steps.rb
+++ b/tests/browser/features/step_definitions/accept_language_steps.rb
@@ -4,7 +4,7 @@
 end
 
 When(/^I visit a random page$/) do
-  visit(RandomPage)
+  visit RandomPage
 end
 
 Then(/^link to the main page has text (.+)$/) do |text|
diff --git a/tests/browser/features/step_definitions/ime_steps.rb 
b/tests/browser/features/step_definitions/ime_steps.rb
index 68203db..732253a 100644
--- a/tests/browser/features/step_definitions/ime_steps.rb
+++ b/tests/browser/features/step_definitions/ime_steps.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 Given(/^I am on a wiki in Kotava language$/) do
-  visit(RandomPage)
+  visit RandomPage
   # Fake a Kotava Wiki
   @browser.execute_script( mw.config.set( 'wgContentLanguage', 'avk' ) )
 end
@@ -55,7 +55,7 @@
 end
 
 When(/^I go to another random page$/) do
-  visit(RandomPage)
+  visit RandomPage
 end
 
 Then(/^in it there must be an element with Malayalam text$/) do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34cccf69812be6e060d3f1dea1199da668e2ca31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Remove unneeded () after visit - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Remove unneeded () after visit
..

Remove unneeded () after visit

Change-Id: Id17f5783fce2b8245ba9b5b8147e64f6daf8b18e
---
M tests/browser/features/step_definitions/translation_stash_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/94/97894/1

diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb 
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index 6d696e7..d77573d 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -30,7 +30,7 @@
 end
 
 When(/^I reload the page$/) do
-   visit(StashPage)
+   visit StashPage
 end
 
 Then(/^I can open and see my earlier translation$/) do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id17f5783fce2b8245ba9b5b8147e64f6daf8b18e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Remove unneeded () after visit - change (mediawiki...TwnMainPage)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Remove unneeded () after visit
..

Remove unneeded () after visit

Change-Id: I805869f862f6def54947d6426c26f8503f082ab3
---
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 757462f..7b7a2c3 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -9,7 +9,7 @@
 end
 
 Given(/^I am on the main page$/) do
-   visit(MainPage)
+   visit MainPage
 end
 
 When(/^I change my interface language away from English$/) do
diff --git 
a/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb 
b/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
index 2317637..65d76ae 100644
--- 
a/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
+++ 
b/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 When(/I go to the main page$/) do
-   visit(MainPage)
+   visit MainPage
 end
 
 Then(/^I should see general statistics about the site$/) do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I805869f862f6def54947d6426c26f8503f082ab3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] db1019 (s3) back to full weight in pool - change (operations/mediawiki-config)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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


Change subject: db1019 (s3) back to full weight in pool
..

db1019 (s3) back to full weight in pool

Change-Id: If5ebd61943c1d52a1ab2e7a123aef107c9f66b3b
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/96/97896/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index fb83c55..d7aa129 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -105,7 +105,7 @@
'db1035'= 0, # snapshot, recache
'db1003'= 400,
'db1010'= 400,
-   'db1019'= 100,
+   'db1019'= 400,
),
's4' = array(
'db1059'   = 0,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5ebd61943c1d52a1ab2e7a123aef107c9f66b3b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] db1019 (s3) back to full weight in pool - change (operations/mediawiki-config)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: db1019 (s3) back to full weight in pool
..


db1019 (s3) back to full weight in pool

Change-Id: If5ebd61943c1d52a1ab2e7a123aef107c9f66b3b
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  ArielGlenn: Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index fb83c55..d7aa129 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -105,7 +105,7 @@
'db1035'= 0, # snapshot, recache
'db1003'= 400,
'db1010'= 400,
-   'db1019'= 100,
+   'db1019'= 400,
),
's4' = array(
'db1059'   = 0,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5ebd61943c1d52a1ab2e7a123aef107c9f66b3b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Prefer double-quoted strings in Ruby code - change (mediawiki...TwnMainPage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Prefer double-quoted strings in Ruby code
..


Prefer double-quoted strings in Ruby code

Bug: 57597
Change-Id: I73df6ed576bc5394af052689ecb95ed02260b6cb
---
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
M tests/browser/features/step_definitions/signed_in_source_language_steps.rb
M tests/browser/features/step_definitions/signup_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/modules/url_module.rb
M tests/browser/features/support/pages/login_page.rb
M tests/browser/features/support/pages/main_page.rb
M tests/browser/features/support/pages/preferences_page.rb
M tests/browser/features/support/pages/reset_preferences.rb
M tests/browser/features/support/pages/search_page.rb
M tests/browser/features/support/pages/signup_page.rb
M tests/browser/features/support/pages/translate_page.rb
M tests/browser/features/user_not_signed_in.feature
M tests/browser/features/user_signed_in_not_approved.feature
15 files changed, 65 insertions(+), 65 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  Zfilipin: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 757462f..9765cd7 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -2,7 +2,7 @@
 end
 
 Given(/^I am logged in$/) do
-   visit(LoginPage).login_with(ENV['MEDIAWIKI_USER'], 
ENV['MEDIAWIKI_PASSWORD'])
+   visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], 
ENV[MEDIAWIKI_PASSWORD])
# Assert that login worked
loggedin = !@browser.execute_script( return mw.user.isAnon(); )
loggedin.should be_true
@@ -14,7 +14,7 @@
 
 When(/^I change my interface language away from English$/) do
visit(PreferencesPage) do |page|
-   page.set_interface_language_element.select_value 'fi'
+   page.set_interface_language_element.select_value fi
page.save_element.click
end
 end
diff --git 
a/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb 
b/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
index 2317637..62f483e 100644
--- 
a/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
+++ 
b/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
@@ -27,8 +27,8 @@
on(TranslatePage) do |page|
# Assuming Finnish here. If that assumption proves to be 
unreliable,
# we can check the data msggroupid attribute instead.
-   page.selected_group.should == 'Tuoreet lisäykset'
-   page.translate_mode_button_element.attribute('class').should 
match(/\bdown\b/)
+   page.selected_group.should == Tuoreet lisäykset
+   page.translate_mode_button_element.attribute(class).should 
match(/\bdown\b/)
end
 end
 
@@ -36,13 +36,13 @@
on(TranslatePage) do |page|
# Assuming Finnish here. If that assumption proves to be 
unreliable,
# we can check the data msggroupid attribute instead.
-   page.selected_group.should == 'Tuoreet käännökset'
-   page.proofread_mode_button_element.attribute('class').should 
match(/\bdown\b/)
+   page.selected_group.should == Tuoreet käännökset
+   page.proofread_mode_button_element.attribute(class).should 
match(/\bdown\b/)
end
 end
 
 When(/^I hover a project tile$/) do
-   on(MainPage).project_tile_element.fire_event('onmouseover')
+   on(MainPage).project_tile_element.fire_event(onmouseover)
 end
 
 When(/^I click the (.*?) button on a project tile$/) do |action|
@@ -50,11 +50,11 @@
 end
 
 Then(/^I should see a list of messages in the the translation view$/) do
-   
on(TranslatePage).translate_mode_button_element.attribute('class').should 
match(/\bdown\b/)
+   
on(TranslatePage).translate_mode_button_element.attribute(class).should 
match(/\bdown\b/)
 end
 
 Then(/^I should see a list of messages in the the proofreading view$/) do
-   
on(TranslatePage).proofread_mode_button_element.attribute('class').should 
match(/\bdown\b/)
+   
on(TranslatePage).proofread_mode_button_element.attribute(class).should 
match(/\bdown\b/)
 end
 
 When(/^I click the message group selector tile$/) do
diff --git 
a/tests/browser/features/step_definitions/signed_in_source_language_steps.rb 
b/tests/browser/features/step_definitions/signed_in_source_language_steps.rb
index 409ee98..2593bd8 100644
--- a/tests/browser/features/step_definitions/signed_in_source_language_steps.rb
+++ 

[MediaWiki-commits] [Gerrit] fix parent level, save incomplete operators - change (mediawiki...Foxway)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: fix parent level, save incomplete operators
..


fix parent level, save incomplete operators

* fix math with arrays
* delete unused function mergeStackAndMath
* delete $parentLevel = 0; // @todo must be zero?

Time: 512 ms, Memory: 25.00Mb
OK (509 tests, 515 assertions)

Change-Id: I6a20cf00f8534776c724a17ee239bf2fbeaf5ffe
---
M includes/Compiler.php
M tests/phpunit/includes/RuntimeTest.php
2 files changed, 74 insertions(+), 111 deletions(-)

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



diff --git a/includes/Compiler.php b/includes/Compiler.php
index 28a5bd8..9e8ad4f 100644
--- a/includes/Compiler.php
+++ b/includes/Compiler.php
@@ -198,7 +198,6 @@

case T_WHITESPACE:

break; // ignore it

case '(': // T_STRING is function
-   
$parentLevel++;

$parentheses[] = $parentFlags;

$parentFlags = FOXWAY_EXPECT_PARENTHES_CLOSE | FOXWAY_THIS_IS_FUNCTION 
| FOXWAY_EXPECT_LIST_PARAMS;

$lastValue[FOXWAY_STACK_PARAM] = array();
@@ -216,9 +215,8 @@

$parentFlags |= FOXWAY_NEED_RESTORE_RIGHT_OPERATORS;

}

ksort( $math );
-   
$memory[] = array($stack, $math); // push stack for restore late. 
Example: echo 1 + function
-   
$stack = array();
-   
$math = array();
+   
$memory[] = array( $stack, $math, $incompleteOperators ); // save it 
for restore late. Example: echo 1 + function
+   
$stack = $math = $incompleteOperators = array();

$needOperator = false;

break 4; /*** EXIT ***/

default: // T_STRING is constant
@@ -388,17 +386,16 @@

$needParams[0][FOXWAY_STACK_PARAM_2] = $operator[FOXWAY_STACK_PARAM]; // Save 
result in operator ':'

$needParams[1][FOXWAY_STACK_PARAM_2] = $needParams[0]; // link operator ':' to 
previous operator '?'

$operator[FOXWAY_STACK_PARAM] = $needParams[1][FOXWAY_STACK_RESULT]; // link 
result of previous operator '?' as param of this operator '?'
-   list( $stack, $math ) = 
array_pop($memory); // restore $stack, $math
+   list ( $stack, $math, 
$incompleteOperators ) = array_pop( $memory ); // restore $stack, $math, 
$incompleteOperators
$stack[] = 
$needParams[1]; // Save previous operator '?' to stack
unset($needParams[0], 
$needParams[1]);
}else{
// it don't need for 
double ternary operators. Example: echo 1?2:3?
$parentheses[] = 
$parentFlags; // only for first ternery operator. Example: echo 1?
}
-   ksort($math);
-   $memory[] = array($stack, 
$math); // Save $stack, $math for restore late
-   $math = array();
-   $stack = array();
+   ksort( $math );
+  

[MediaWiki-commits] [Gerrit] (bug #57014) Introducing FormatSnakValue API module - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: (bug #57014) Introducing FormatSnakValue API module
..


(bug #57014) Introducing FormatSnakValue API module

Change-Id: Ide20888b8943b87c9900862a125decf1f01dde53
---
M repo/Wikibase.classes.php
M repo/Wikibase.php
A repo/includes/api/FormatSnakValue.php
A repo/tests/phpunit/includes/api/FormatSnakValueTest.php
4 files changed, 358 insertions(+), 0 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 9e347fc..408dcb2 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -112,6 +112,7 @@
'Wikibase\Api\ClaimModificationHelper' = 
'includes/api/ClaimModificationHelper.php',
'Wikibase\Api\ResultBuilder' = 
'includes/api/ResultBuilder.php',
'Wikibase\Api\SiteLinkTargetProvider' = 
'includes/api/SiteLinkTargetProvider.php',
+   'Wikibase\Api\FormatSnakValue' = 
'includes/api/FormatSnakValue.php',
 
// includes/serializers
'Wikibase\Serializers\EntityRevisionSerializer' = 
'includes/serializers/EntityRevisionSerializer.php',
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a2298ff..5d78a4e 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -123,6 +123,7 @@
$wgAPIModules['wbremovequalifiers'] = 
'Wikibase\Api\RemoveQualifiers';
$wgAPIModules['wbsetqualifier'] = 
'Wikibase\Api\SetQualifier';
$wgAPIModules['wbmergeitems']   = 
'Wikibase\Api\MergeItems';
+   $wgAPIModules['wbformatvalue']  = 
'Wikibase\Api\FormatSnakValue';
 
// Special page registration
$wgSpecialPages['NewItem']  
= 'Wikibase\Repo\Specials\SpecialNewItem';
diff --git a/repo/includes/api/FormatSnakValue.php 
b/repo/includes/api/FormatSnakValue.php
new file mode 100644
index 000..0610f99
--- /dev/null
+++ b/repo/includes/api/FormatSnakValue.php
@@ -0,0 +1,251 @@
+?php
+
+namespace Wikibase\Api;
+
+use ApiBase;
+use DataValues\DataValue;
+use DataValues\DataValueFactory;
+use DataValues\IllegalValueException;
+use DataValues\StringValue;
+use LogicException;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use Wikibase\Lib\OutputFormatValueFormatterFactory;
+use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\TypedValueFormatter;
+use Wikibase\Repo\WikibaseRepo;
+
+/**
+ * API module for using value formatters.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class FormatSnakValue extends ApiWikibase {
+
+   /**
+* @var null|OutputFormatValueFormatterFactory
+*/
+   protected $formatterFactory = null;
+
+   /**
+* @var null|DataValueFactory
+*/
+   protected $valueFactory = null;
+
+   /**
+* @return OutputFormatValueFormatterFactory
+*/
+   protected function getFormatterFactory() {
+   if ( $this-formatterFactory === null ) {
+
+   $this-formatterFactory = 
WikibaseRepo::getDefaultInstance()-getValueFormatterFactory();
+   }
+
+   return $this-formatterFactory;
+   }
+
+   /**
+* @return DataValueFactory
+*/
+   protected function getValueFactory() {
+   if ( $this-valueFactory === null ) {
+   $this-valueFactory = 
WikibaseRepo::getDefaultInstance()-getDataValueFactory();
+   }
+
+   return $this-valueFactory;
+   }
+
+   /**
+* @see ApiBase::execute
+*
+* @since 0.1
+*/
+   public function execute() {
+   $params = $this-extractRequestParams();
+
+   $value = $this-decodeDataValue( $params['datavalue'] );
+   $dataTypeId = $this-getDataTypeId( $params );
+
+   $formatter = $this-getFormatter( $value );
+
+   if ( $formatter instanceof TypedValueFormatter ) {
+   // use data type id, if we can
+   $formattedValue = $formatter-formatValue( $value, 
$dataTypeId );
+   } else {
+   // rely on value type
+   $formattedValue = $formatter-format( $value );
+   }
+
+   $this-getResult()-addValue(
+   null,
+   'result',
+   $formattedValue
+   );
+   }
+
+   /**
+* @throws \LogicException
+* @return ValueFormatter
+*/
+   private function getFormatter() {
+   $params = $this-extractRequestParams();
+
+   $options = $this-getOptionsObject( $params['options'] );
+   $formatter = 

[MediaWiki-commits] [Gerrit] Prune login page and ws fix in signup page - change (mediawiki...TwnMainPage)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Prune login page and ws fix in signup page
..

Prune login page and ws fix in signup page

Change-Id: I58832f905472d936735007cb9a305c069ca1a216
---
M tests/browser/features/support/pages/login_page.rb
M tests/browser/features/support/pages/signup_page.rb
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage 
refs/changes/97/97897/1

diff --git a/tests/browser/features/support/pages/login_page.rb 
b/tests/browser/features/support/pages/login_page.rb
index e4179e4..764bd1a 100644
--- a/tests/browser/features/support/pages/login_page.rb
+++ b/tests/browser/features/support/pages/login_page.rb
@@ -4,17 +4,10 @@
   include URL
   page_url URL.url(Special:UserLogin)
 
-  div(:feedback, class: errorbox)
   button(:login, id: wpLoginAttempt)
   text_field(:password, id: wpPassword1)
-  a(:password_strength, text: password strength)
-  a(:phishing, text: phishing)
   text_field(:username, id: wpName1)
-  a(:username_displayed, title: /Your user page/)
 
-  def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
-  end
   def login_with(username, password)
 self.username = username
 self.password = password
diff --git a/tests/browser/features/support/pages/signup_page.rb 
b/tests/browser/features/support/pages/signup_page.rb
index 54428ac..46f1a8a 100644
--- a/tests/browser/features/support/pages/signup_page.rb
+++ b/tests/browser/features/support/pages/signup_page.rb
@@ -4,7 +4,7 @@
include URL
page_url URL.url(Special:MainPage?%=params[:extra]%)
 
-   div(:signup_language_selector, class: signup-language-selector )
+   div(:signup_language_selector, class: signup-language-selector)
text_field(:language_filter, id: languagefilter)
def select_signup_language(language)
self.signup_language_selector_element.click

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58832f905472d936735007cb9a305c069ca1a216
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Limiting default TranslationSearch to UI langcode - change (mediawiki...TwnMainPage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Limiting default TranslationSearch to UI langcode
..


Limiting default TranslationSearch to UI langcode

Bug: 56481
Change-Id: Ie30cbfeaf70005bbfa8791b7da7ec94261ff3fb2
---
M specials/SpecialTwnMainPage.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/specials/SpecialTwnMainPage.php b/specials/SpecialTwnMainPage.php
index b970321..bbdf744 100644
--- a/specials/SpecialTwnMainPage.php
+++ b/specials/SpecialTwnMainPage.php
@@ -158,6 +158,13 @@
'dir' = $this-getLanguage()-getDir(),
) );
 
+   $out .= Html::element( 'input',
+   array(
+   'name' = 'language',
+   'value' = $this-getLanguage()-getCode(),
+   'type' = 'hidden',
+   ) );
+
$out .= Html::element( 'button',
array(
'class' = 'blue button',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie30cbfeaf70005bbfa8791b7da7ec94261ff3fb2
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@byagowi.com
Gerrit-Reviewer: Ebrahim ebra...@byagowi.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Prefer double-quoted strings in Ruby code - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Prefer double-quoted strings in Ruby code
..


Prefer double-quoted strings in Ruby code

Bug: 57597
Change-Id: I72c4fbbfafa492ced625e1f5d87087b9ceba9d2e
---
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/translation_stash_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/hooks.rb
M tests/browser/features/support/modules/url_module.rb
M tests/browser/features/support/pages/login_page.rb
M tests/browser/features/support/pages/stash_page.rb
7 files changed, 26 insertions(+), 26 deletions(-)

Approvals:
  Jhall: Looks good to me, but someone else must approve
  Nikerabbit: Looks good to me, approved
  Zfilipin: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 1708e2e..42ff778 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -1,5 +1,5 @@
 Given(/^I am logged in$/) do
-   visit(LoginPage).login_with(ENV['MEDIAWIKI_USER'], 
ENV['MEDIAWIKI_PASSWORD'])
+   visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], 
ENV[MEDIAWIKI_PASSWORD])
 end
 
 Given(/^I am a sandboxed user on the stash page$/) do
diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb 
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index 6d696e7..9046cf1 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -3,7 +3,7 @@
 end
 
 Then(/^I should be able to select a language$/) do
-   on(StashPage).select_language('fi')
+   on(StashPage).select_language(fi)
 end
 
 Then(/^I should see the save button$/) do
@@ -25,7 +25,7 @@
 Then(/^I should see the next message open for translation$/) do
on(StashPage) do |page|
page.translation_element(1).when_present.should be_visible
-   page.translation_element(1).value.should == ''
+   page.translation_element(1).value.should == 
end
 end
 
@@ -34,10 +34,10 @@
 end
 
 Then(/^I can open and see my earlier translation$/) do
-   pending('Does not work because of random language selection on 
reload.') do
+   pending(Does not work because of random language selection on 
reload.) do
on(StashPage) do |page|
page.edit_element.when_present(10).click
-   page.translation_element.when_present.value.should == 
'Pupu'
+   page.translation_element.when_present.value.should == 
Pupu
end
end
 end
@@ -51,7 +51,7 @@
pending
(0..19).each do |i|
on(StashPage).make_a_translation(i)
-   step 'I should see my translation saved'
+   step I should see my translation saved
end
 end
 
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index 2281d94..24feda0 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1 +1 @@
-require 'mediawiki/selenium'
+require mediawiki/selenium
diff --git a/tests/browser/features/support/hooks.rb 
b/tests/browser/features/support/hooks.rb
index 2f44b18..ce657f4 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -1,3 +1,3 @@
-After('@stash') do |scenario|
+After(@stash) do |scenario|
visit(StashPage, :using_params = {:extra = 
integrationtesting=deactivatestash})
 end
diff --git a/tests/browser/features/support/modules/url_module.rb 
b/tests/browser/features/support/modules/url_module.rb
index 6268546..1dd1856 100644
--- a/tests/browser/features/support/modules/url_module.rb
+++ b/tests/browser/features/support/modules/url_module.rb
@@ -1,9 +1,9 @@
 module URL
   def self.url(name)
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
+if ENV[MEDIAWIKI_URL]
+  mediawiki_url = ENV[MEDIAWIKI_URL]
 else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
+  mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
 end
 #{mediawiki_url}#{name}
   end
diff --git a/tests/browser/features/support/pages/login_page.rb 
b/tests/browser/features/support/pages/login_page.rb
index 67648a8..8392044 100644
--- a/tests/browser/features/support/pages/login_page.rb
+++ b/tests/browser/features/support/pages/login_page.rb
@@ -2,11 +2,11 @@
include PageObject
 
include URL
-   page_url URL.url('Special:UserLogin')
+   page_url URL.url(Special:UserLogin)
 
-   text_field(:username, id: 'wpName1')
-   text_field(:password, id: 'wpPassword1')
-   

[MediaWiki-commits] [Gerrit] Zero: Changed 470-01 to whitelist all languages - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: Zero: Changed 470-01 to whitelist all languages
..


Zero: Changed 470-01 to whitelist all languages

Change-Id: Ia34032bce830068086fc852c4af0faec49b4e81c
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/zero.inc.vcl.erb 
b/templates/varnish/zero.inc.vcl.erb
index 5a8bfe6..7c6ceed 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -76,7 +76,7 @@
} else if (req.http.X-CS2 == 470-01) {
set req.http.X-DfltLang = bn;
if (req.http.X-Subdomain == ZERO) {
-   if (req.http.host ~ (^(bn)\.zero|^zero)\.wikipedia\.) 
{
+   if (req.http.host ~ 
(^([a-zA-Z0-9-]+)\.zero|^zero)\.wikipedia\.) {
set req.http.X-CS = 470-01;
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia34032bce830068086fc852c4af0faec49b4e81c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Dfoy d...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] gdash.wm.o: noc - misc varnish - change (operations/dns)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: gdash.wm.o: noc - misc varnish
..


gdash.wm.o: noc - misc varnish

Depends on I088a655a1.

Change-Id: I85dffdc8a90bd50fb47b5eaa8f4193f0cad2019e
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified

Objections:
  Ori.livneh: There's a problem with this change, please improve



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 775a0bf..9aa99f0 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -527,6 +527,7 @@
 gerrit 1H  IN A208.80.154.81
1H  IN  2620:0:861:3:208:80:154:81
 git1H  IN CNAMEmisc-web-lb.eqiad
+gdash  1H  IN CNAMEmisc-web-lb.eqiad
 
 icinga 1H  IN CNAMEneon
 icinga-admin   1H  IN A208.80.154.14
@@ -683,7 +684,6 @@
 globalblog 1H  IN CNAMEholmium.wikimedia.org.
 ganglia3   1H  IN CNAMEnickel
 ganglia3-tip   1H  IN CNAMEnickel
-gdash  1H  IN CNAMEnoc
 graphite   1H  IN CNAMEnoc
 ishmael1H  IN CNAMEneon
 jobs   1H  IN CNAMEwikimedia-lb

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85dffdc8a90bd50fb47b5eaa8f4193f0cad2019e
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add frame parameters in renderFunction - change (mediawiki...Foxway)

[Pastakhov (Code Review)]

Pastakhov has uploaded a new change for review.

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


Change subject: add frame parameters in renderFunction
..

add frame parameters in renderFunction

Change-Id: Ib4591791faee6741d605e7adb903b4d710f4347f
---
M Foxway.body.php
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/Foxway.body.php b/Foxway.body.php
index 4ffbcff..2e43cfc 100644
--- a/Foxway.body.php
+++ b/Foxway.body.php
@@ -46,11 +46,11 @@
try {
$result = Foxway\Runtime::runSource(
$command,
-   
array($frame-getTitle()-getPrefixedText()),
-   self::getScope($frame),
+   array_merge( 
(array)$frame-getTitle()-getPrefixedText(), $frame-getArguments() ),
+   self::getScope( $frame ),
array( 'Parser'=$parser, 
'PPFrame'=$frame )
);
-   $return = implode($result);
+   $return = implode( $result );
} catch (\Foxway\ExceptionFoxway $exc) {
$return = (string) $exc;
} catch (Exception $exc) {
@@ -83,8 +83,8 @@
try {
$result = Foxway\Runtime::runSource(
$input,
-   
array_merge((array)$frame-getTitle()-getPrefixedText(),$frame-getArguments()),
-   self::getScope($frame),
+   array_merge( 
(array)$frame-getTitle()-getPrefixedText(), $frame-getArguments() ),
+   self::getScope( $frame ),
array( 'Parser'=$parser, 
'PPFrame'=$frame )
);
} catch ( \Foxway\ExceptionFoxway $exc ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4591791faee6741d605e7adb903b4d710f4347f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: develop
Gerrit-Owner: Pastakhov pastak...@yandex.ru

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

[MediaWiki-commits] [Gerrit] Improvments in Update script and size calculations for diffe... - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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


Change subject: Improvments in Update script and size calculations for 
different output formats
..

Improvments in Update script and size calculations for different output formats

Change-Id: Ib61e409ced6b99a4b36c81af5da9c547e151ec41
---
M MathObject.php
M MathSearch.hooks.php
M SpecialMathDebug.php
M maintenance/UpdateMath.php
M maintenance/batch.sh
5 files changed, 58 insertions(+), 27 deletions(-)


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

diff --git a/MathObject.php b/MathObject.php
index 51b1535..f1c0a2b 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -5,6 +5,7 @@
protected $anchorID = 0;
protected $pageID = 0;
protected $index_timestamp = null;
+   protected $dbLoadTime= 0;
 
private static function DebugPrint( $s ) {
// $s= Sanitizer::safeEncodeAttribute($s);
@@ -32,7 +33,7 @@
}
 
public function getInputHash() {
-   wfDebugLog( 'MathSearch', 'Debugger dies here' );
+   //wfDebugLog( 'MathSearch', 'Debugger dies here' );
// die('end of debug toolbar');
if ( $this-inputHash ) {
return $this-inputHash;
@@ -52,7 +53,7 @@
}
$instance-inputHash = $res-mathindex_inputhash;
$instance-readFromDatabase();
-   self::DebugPrint( 'got' . var_export( $instance, true ) 
);
+   //self::DebugPrint( 'got' . var_export( $instance, true 
) );
return $instance;
} else {
return false;
@@ -102,6 +103,7 @@
} catch ( Exception $e ) {
return Databaseproblem;
}
+   $wgOut-addWikiText($res-numRows(). 'results');
if ( $res ) {
foreach ( $res as $row ) {
$wgOut-addWikiText( '*' . 
$row-mathobservation_featuretype . ' code' .
@@ -140,8 +142,11 @@
array( 'mathindex' ), 
self::dbIndexFieldsArray(), 'mathindex_page_id = ' . $pid
. ' AND mathindex_anchor= ' . $eid
);
-   self::DebugPrint( var_export( $res, true ) );
-   return self::constructformpagerow( $res );
+   //self::DebugPrint( var_export( $res, true ) );
+   $start = microtime(true);
+   $o = self::constructformpagerow( $res );
+   wfDebugLog(MathSearch, Fetched in . 
(microtime(true)-$start) );
+   return $o;
}
 
/**
@@ -156,7 +161,7 @@
);
 
foreach ( $res as $row ) {
-   self::DebugPrint( var_export( $row, true ) );
+   //self::DebugPrint( var_export( $row, true ) );
$var = self::constructformpagerow( $row );
if ( $var ) {
$var-printLink2Page( false );
@@ -201,7 +206,11 @@
public function render( $purge = false ) {
 
}
-
+   public function getPng() { 
+   $texvc = MathTexvc::newFromMd5($this-getMd5());
+   $texvc-readFromDatabase();
+   return $texvc-getPng();
+   }
 }
 
 /*
diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index 1579222..941f8d6 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -84,7 +84,7 @@
}
}
$url = SpecialPage::getTitleFor( 'FormulaInfo' )-getLocalUrl( 
array( 'pid' = $pid, 'eid' = $eid ) );
-   $Result = 'a href=' . $url . ' id=math' . $eid . '' . 
$Result . '/a';
+   $Result = 'a href=' . $url . ' id=math' . $eid . ' 
style=color:inherit;' . $Result . '/a';
return true;
}
 
diff --git a/SpecialMathDebug.php b/SpecialMathDebug.php
index fb5e516..d5896a8 100644
--- a/SpecialMathDebug.php
+++ b/SpecialMathDebug.php
@@ -168,7 +168,8 @@
$modeInt= (int) substr($mode, 0,1);
$renderer = MathRenderer::getRenderer( $t, array(), $modeInt );
$renderer-setPurge( $purge );
-   $fragment = $renderer-render();
+   $renderer-render();
+   $fragment = $renderer-getHtmlOutput();
// Give grep a chance to find the usages:
// mathmode_0, mathmode_1, mathmode_2, mathmode_3, mathmode_4,
// mathmode_5, mathmode_6, mathmode_7, mathmode_7+
@@ -204,11 +205,8 @@
}
}
private function getTexvcTex( $tex ) {
-   $tmpDir = wfTempDir();
-   $renderer = MathRenderer::getRenderer( $tex, array(), 
MW_MATH_PNG );
- 

[MediaWiki-commits] [Gerrit] decom gdash on professor - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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


Change subject: decom gdash on professor
..

decom gdash on professor

Replaced by tungsten in eqiad. I'll clean up the leftovers manually.

Change-Id: I8d168621c6b488b11a9103b926a05d242343f40a
---
M files/graphite/apache.conf
M manifests/misc/graphite.pp
M templates/apache/sites/graphite.wikimedia.org.erb
3 files changed, 1 insertion(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/97900/1

diff --git a/files/graphite/apache.conf b/files/graphite/apache.conf
index ed42215..31d05a7 100644
--- a/files/graphite/apache.conf
+++ b/files/graphite/apache.conf
@@ -30,15 +30,3 @@
 Alias /media/ /usr/share/pyshared/django/contrib/admin/media/
 
 /VirtualHost
-
-VirtualHost *:80
-   ServerName gdash.wikimedia.org 
-   ServerAlias gdash gdash.pmtpa.wmnet
-   DocumentRoot /opt/graphite/webapp/gdash/public
-   Directory /opt/graphite/webapp/gdash/public
-   Allow from all
-   Options -MultiViews
-
-   RedirectMatch temp ^/dashboards/?$ /
-   /Directory
-/VirtualHost
diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index a9e1351..cf8eae0 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -3,7 +3,7 @@
 class misc::graphite {
system::role { misc::graphite: description = graphite and carbon 
services }
 
-   include webserver::apache2, misc::graphite::gdash
+   include webserver::apache2
 
package { [ python-libxml2, python-sqlite, python-sqlitecachec, 
python-setuptools, libapache2-mod-python, libcairo2, python-cairo, 
python-simplejson, python-django, python-django-tagging, 
python-twisted, python-twisted-runner, python-twisted-web, memcached, 
python-memcache ]:
ensure = present;
@@ -84,28 +84,6 @@
#}
 }
 
-class misc::graphite::gdash {
-$install_dir = '/srv/deployment/gdash/gdash'
-
-deployment::target { 'gdash': }
-
-class { '::gdash':
-graphite_host   = 'https://graphite.wikimedia.org',
-template_source = 'puppet:///files/graphite/gdash',
-install_dir = $install_dir,
-options = {
-  title = 'wmf stats',
-  prefix= '',
-  refresh_rate  = 300,
-  graph_columns = 1,
-  graph_width   = 1024,
-  hide_legend   = false,
-  graph_height  = 500,
-  whisper_dir   = '/a/graphite/storage/whisper',
-  deploy_addon  = 
'target=alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),c0c0c080),sync-common-file)target=alias(lineWidth(color(drawAsInfinite(deploy.sync-common-all),gold),2),sync-common-all)target=alias(lineWidth(color(drawAsInfinite(deploy.scap),white),2),scap
 deploy)',
-},
-}
-}
 
 # == Class: misc::graphite::navtiming
 #
diff --git a/templates/apache/sites/graphite.wikimedia.org.erb 
b/templates/apache/sites/graphite.wikimedia.org.erb
index 317ab0b..34af152 100644
--- a/templates/apache/sites/graphite.wikimedia.org.erb
+++ b/templates/apache/sites/graphite.wikimedia.org.erb
@@ -36,35 +36,6 @@
 
 /VirtualHost
 
-VirtualHost *:80
-   ServerName gdash.wikimedia.org
-   ServerAlias gdash 
-   Location /
-   Satisfy Any
-   Allow from all
-   ProxyPass http://gdash.pmtpa.wmnet:81/
-   ProxyPassReverse http://gdash.pmtpa.wmnet:81/
-   /Location 
-/VirtualHost
-
-VirtualHost *:443
-   ServerName gdash.wikimedia.org
-
-   SSLEngine on
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
-   Location /
-   Satisfy Any
-   Allow from all
-   ProxyPass http://gdash.pmtpa.wmnet:81/
-   ProxyPassReverse http://gdash.pmtpa.wmnet:81/
-   /Location 
-/VirtualHost
-
 # this doesn't belong here, shh.
 VirtualHost *:80
ServerName ishmael.wikimedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d168621c6b488b11a9103b926a05d242343f40a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add maitenance hints for missing variable statistics - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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


Change subject: Add maitenance hints for missing variable statistics
..

Add maitenance hints for missing variable statistics

Change-Id: I9ac44ad82bf7985b32271bb75a26aa17301f74fd
---
M FormulaInfo.php
M MathObject.php
M README
3 files changed, 11 insertions(+), 2 deletions(-)


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

diff --git a/FormulaInfo.php b/FormulaInfo.php
index 536c7b6..5257adb 100644
--- a/FormulaInfo.php
+++ b/FormulaInfo.php
@@ -74,7 +74,7 @@
$out-addWikiText( Occurences on the following pages: );
wfDebugLog( MathSearch, var_export( $mo-getAllOccurences(), 
true ) );
// $wgOut-addWikiText('b:'.var_export($res,true).'/b');
-   $out-addWikiText( 'TeX (as stored in database): 
syntaxhighlight' . $mo-getTex(). '/syntaxhighlight');
+   $out-addWikiText( 'TeX (as stored in database): 
syntaxhighlight lang=latex' . $mo-getTex(). '/syntaxhighlight');
$out-addWikiText( 'MathML 
('.self::getlengh($mo-getMathml()).') :', false );
$out-addHtml( 'a href=/wiki/Special:MathSearch?mathpattern=' 
. urlencode( $mo-getTex() ) . 'searchx=Searchimg 
src=http://wikidemo.formulasearchengine.com/images/FSE-PIC.png; width=15 
height=15/a' );
$out-addHtml(  $mo-getMathml() );
diff --git a/MathObject.php b/MathObject.php
index f1c0a2b..81508c1 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -104,6 +104,10 @@
return Databaseproblem;
}
$wgOut-addWikiText($res-numRows(). 'results');
+   if ($res-numRows() == 0){
+   $wgOut-addWikiText(no statistics present please run 
the maintenance script ExtractFeatures.php);
+   }
+   $wgOut-addWikiText($res-numRows(). ' results');
if ( $res ) {
foreach ( $res as $row ) {
$wgOut-addWikiText( '*' . 
$row-mathobservation_featuretype . ' code' .
@@ -206,7 +210,7 @@
public function render( $purge = false ) {
 
}
-   public function getPng() { 
+   public function getPng() {
$texvc = MathTexvc::newFromMd5($this-getMd5());
$texvc-readFromDatabase();
return $texvc-getPng();
diff --git a/README b/README
index 366239b..cf1bd41 100644
--- a/README
+++ b/README
@@ -2,4 +2,9 @@
 -MWSearch
 -MathWebSearch
 
+For the XQueryGenerator you need to install
+zorba to
+http://zorbawebsite2.my28msec.com/html/documentation/2.8.0/zorba/php_ubuntu_tutorial
+so that XQueryProcessor.php is located in the subdirectory
+'modules/Zorba/XQueryProcessor.php'
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ac44ad82bf7985b32271bb75a26aa17301f74fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] Add maitenance hints for missing variable statistics - change (mediawiki...MathSearch)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: Add maitenance hints for missing variable statistics
..


Add maitenance hints for missing variable statistics

Change-Id: I9ac44ad82bf7985b32271bb75a26aa17301f74fd
---
M FormulaInfo.php
M MathObject.php
M README
3 files changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Physikerwelt: Verified; Looks good to me, approved



diff --git a/FormulaInfo.php b/FormulaInfo.php
index 536c7b6..5257adb 100644
--- a/FormulaInfo.php
+++ b/FormulaInfo.php
@@ -74,7 +74,7 @@
$out-addWikiText( Occurences on the following pages: );
wfDebugLog( MathSearch, var_export( $mo-getAllOccurences(), 
true ) );
// $wgOut-addWikiText('b:'.var_export($res,true).'/b');
-   $out-addWikiText( 'TeX (as stored in database): 
syntaxhighlight' . $mo-getTex(). '/syntaxhighlight');
+   $out-addWikiText( 'TeX (as stored in database): 
syntaxhighlight lang=latex' . $mo-getTex(). '/syntaxhighlight');
$out-addWikiText( 'MathML 
('.self::getlengh($mo-getMathml()).') :', false );
$out-addHtml( 'a href=/wiki/Special:MathSearch?mathpattern=' 
. urlencode( $mo-getTex() ) . 'searchx=Searchimg 
src=http://wikidemo.formulasearchengine.com/images/FSE-PIC.png; width=15 
height=15/a' );
$out-addHtml(  $mo-getMathml() );
diff --git a/MathObject.php b/MathObject.php
index f1c0a2b..81508c1 100644
--- a/MathObject.php
+++ b/MathObject.php
@@ -104,6 +104,10 @@
return Databaseproblem;
}
$wgOut-addWikiText($res-numRows(). 'results');
+   if ($res-numRows() == 0){
+   $wgOut-addWikiText(no statistics present please run 
the maintenance script ExtractFeatures.php);
+   }
+   $wgOut-addWikiText($res-numRows(). ' results');
if ( $res ) {
foreach ( $res as $row ) {
$wgOut-addWikiText( '*' . 
$row-mathobservation_featuretype . ' code' .
@@ -206,7 +210,7 @@
public function render( $purge = false ) {
 
}
-   public function getPng() { 
+   public function getPng() {
$texvc = MathTexvc::newFromMd5($this-getMd5());
$texvc-readFromDatabase();
return $texvc-getPng();
diff --git a/README b/README
index 366239b..cf1bd41 100644
--- a/README
+++ b/README
@@ -2,4 +2,9 @@
 -MWSearch
 -MathWebSearch
 
+For the XQueryGenerator you need to install
+zorba to
+http://zorbawebsite2.my28msec.com/html/documentation/2.8.0/zorba/php_ubuntu_tutorial
+so that XQueryProcessor.php is located in the subdirectory
+'modules/Zorba/XQueryProcessor.php'
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ac44ad82bf7985b32271bb75a26aa17301f74fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
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] Fixed bug where variables referenced where not reachable (ou... - change (mediawiki...MassEditRegex)

[Netbrain (Code Review)]

Netbrain has uploaded a new change for review.

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


Change subject: Fixed bug where variables referenced where not reachable (out 
of scope)
..

Fixed bug where variables referenced where not reachable (out of scope)

Change-Id: I9a9f9c810a9a5da1d169c2e7d04cc2c5a59a88d7
---
M MassEditRegex.class.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassEditRegex 
refs/changes/02/97902/1

diff --git a/MassEditRegex.class.php b/MassEditRegex.class.php
index ccf5950..377c390 100644
--- a/MassEditRegex.class.php
+++ b/MassEditRegex.class.php
@@ -322,16 +322,16 @@
$iCount = 0;
$newText = $curText;
foreach ( $this-aMatch as $i = $strMatch ) {
-   $this-strNextReplace = $this-aReplace[$i];
+   $strNextReplace = $this-aReplace[$i];
$result = @preg_replace_callback( $strMatch,
-   function ( $aMatches ) {
+   function ( $aMatches ) use($strNextReplace){
$strFind = array();
$strReplace = array();
foreach ($aMatches as $i = $strMatch) {
$aFind[] = '$' . $i;
$aReplace[] = $strMatch;
}
-   return str_replace($aFind, $aReplace, 
$this-strNextReplace);
+   return str_replace($aFind, $aReplace, 
$strNextReplace);
}, $newText, -1, $iCount );
if ($result !== null) {
$newText = $result;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a9f9c810a9a5da1d169c2e7d04cc2c5a59a88d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassEditRegex
Gerrit-Branch: master
Gerrit-Owner: Netbrain k...@heldig.org

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

[MediaWiki-commits] [Gerrit] Fix Wikibase noc symlink - change (operations/mediawiki-config)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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


Change subject: Fix Wikibase noc symlink
..

Fix Wikibase noc symlink

Bug: 57641
Change-Id: Ie0b2fd1dda66acd25545b4e2e7a2f6952e226d60
---
A docroot/noc/conf/Wikibase.php.txt
D docroot/noc/conf/Wikidata.php.txt
M docroot/noc/createTxtFileSymlinks.sh
3 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/03/97903/1

diff --git a/docroot/noc/conf/Wikibase.php.txt 
b/docroot/noc/conf/Wikibase.php.txt
new file mode 12
index 000..ae307ff
--- /dev/null
+++ b/docroot/noc/conf/Wikibase.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/Wikibase.php
\ No newline at end of file
diff --git a/docroot/noc/conf/Wikidata.php.txt 
b/docroot/noc/conf/Wikidata.php.txt
deleted file mode 12
index 20780bf..000
--- a/docroot/noc/conf/Wikidata.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/Wikidata.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index e0bb980..30d7e18 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -47,7 +47,7 @@
wmf-config/session.php
wmf-config/session-labs.php
wmf-config/twemproxy.yaml
-   wmf-config/Wikidata.php
+   wmf-config/Wikibase.php
 )
 
 # Create non-txt symlink from mediawiki-config

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0b2fd1dda66acd25545b4e2e7a2f6952e226d60
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Installation instructions for FastStringSearch - change (translatewiki)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Installation instructions for FastStringSearch
..

Installation instructions for FastStringSearch

For Translate API:messagegroups it improves
performance quite a bit, tested with ab:

  min  mean[+/-sd] median   max
Total:   6790 7126 451.5   69858532
Total (fss): 2253 2354  72.7   23532547

Change-Id: I110f58d598930c9eb2e795f9e0e8a65e0f8599ff
---
M puppet/README
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/04/97904/1

diff --git a/puppet/README b/puppet/README
index 703e705..05f7567 100644
--- a/puppet/README
+++ b/puppet/README
@@ -34,7 +34,7 @@
 
 --
 
-Install wikidiff
+Install wikidiff and FastStringSearch
 
 cd /www/translatewiki.net/w/extensions/wikidiff2
 b phpize
@@ -45,6 +45,8 @@
 Create /etc/php5/conf.d/20-wikidiff2.ini:
   extension=wikidiff2.so
 
+Adapt the same for FastStringSearch
+
 And restart php5-fpm if needed.
 
 --

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I110f58d598930c9eb2e795f9e0e8a65e0f8599ff
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix CirrusSearch dependencies - change (mediawiki/vagrant)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Fix CirrusSearch dependencies
..


Fix CirrusSearch dependencies

- make sure JDK is available
- make sure elasticsearch service is running

Not the nicest (does not detect JDK from a different source,
does not stop the service when CirrusSearch is removed) but works.

Bug: 57543
Change-Id: I453bb5089bdba7b8a1a38f08dde49fb55e0f0a4c
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
A puppet/modules/elasticsearch/manifests/init.pp
3 files changed, 23 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index 9a2068d..f41658e 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -49,10 +49,6 @@
 package { 'ocaml-native-compilers': }
 }
 
-class packages::elasticsearch {
-package { 'elasticsearch': }
-}
-
 class packages::ffmpeg {
 package { 'ffmpeg': }
 }
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 160a8ce..27e33eb 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -635,12 +635,13 @@
 # Elasticsearch.
 class role::cirrussearch {
 include role::mediawiki
-include packages::elasticsearch
+
+class { '::elasticsearch': }
 
 @mediawiki::extension { 'Elastica': }
 
 @mediawiki::extension { 'CirrusSearch':
-require = Package['elasticsearch'],
+require = Service['elasticsearch'],
 }
 
 exec { 'update elastica submodule':
diff --git a/puppet/modules/elasticsearch/manifests/init.pp 
b/puppet/modules/elasticsearch/manifests/init.pp
new file mode 100644
index 000..05a6bbb
--- /dev/null
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -0,0 +1,20 @@
+# == Class: Elasticsearch
+#
+# Elasticsearch is a powerful open source search and analytics
+# engine, much like Solr, but with a more user-friendly inteface.
+#
+class elasticsearch {
+package { 'elasticsearch':
+ensure = present,
+}
+
+package { 'openjdk-7-jre-headless':
+ensure = present,
+}
+
+service { 'elasticsearch':
+enable  = true,
+ensure  = running,
+require = Package['elasticsearch', 'openjdk-7-jre-headless'],
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I453bb5089bdba7b8a1a38f08dde49fb55e0f0a4c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update version date. - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update version date.
..


Update version date.

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

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



diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 389ce9f..c15a330 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -25,7 +25,7 @@
 /**
  * Version number used in extension credits and in other placed where needed.
  */
-define( 'ULS_VERSION', '2013-10-28' );
+define( 'ULS_VERSION', '2013-11-27' );
 
 $wgExtensionCredits['other'][] = array(
'path' = __FILE__,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8533c30bec825a2ef6ebde4c33bb9d5fb09ffd59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Arrbee run...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update version date. - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update version date.
..


Update version date.

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

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



diff --git a/Translate.php b/Translate.php
index 848da20..83f0228 100644
--- a/Translate.php
+++ b/Translate.php
@@ -17,7 +17,7 @@
 /**
  * Version number used in extension credits and in other places where needed.
  */
-define( 'TRANSLATE_VERSION', '2013-10-28' );
+define( 'TRANSLATE_VERSION', '2013-10-27' );
 
 /**
  * Extension credits properties.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6a5bfe9f54f65f0d126f4d829e02eb4b33cfd9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Arrbee run...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix spacing for NewWikiPageNavigationEvent - change (apps...wikipedia)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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


Change subject: Fix spacing for NewWikiPageNavigationEvent
..

Fix spacing for NewWikiPageNavigationEvent

Change-Id: Iaf80754a1e78f4ec9973062b3f152574f4cc02ab
---
M 
wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/05/97905/1

diff --git 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
index 042e0fc..ae25589 100644
--- 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
+++ 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
@@ -3,13 +3,13 @@
 import org.wikimedia.wikipedia.PageTitle;
 
 public class NewWikiPageNavigationEvent {
-private final PageTitle title;
+private final PageTitle title;
 
-public NewWikiPageNavigationEvent(PageTitle title) {
-this.title = title;
-}
+public NewWikiPageNavigationEvent(PageTitle title) {
+this.title = title;
+}
 
-public PageTitle getTitle() {
-return title;
-}
+public PageTitle getTitle() {
+return title;
+}
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf80754a1e78f4ec9973062b3f152574f4cc02ab
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Remove unneeded () after visit - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unneeded () after visit
..


Remove unneeded () after visit

Change-Id: I34cccf69812be6e060d3f1dea1199da668e2ca31
---
M tests/browser/features/step_definitions/accept_language_steps.rb
M tests/browser/features/step_definitions/ime_steps.rb
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  Zfilipin: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb 
b/tests/browser/features/step_definitions/accept_language_steps.rb
index b1b7dba..3ae88a2 100644
--- a/tests/browser/features/step_definitions/accept_language_steps.rb
+++ b/tests/browser/features/step_definitions/accept_language_steps.rb
@@ -4,7 +4,7 @@
 end
 
 When(/^I visit a random page$/) do
-  visit(RandomPage)
+  visit RandomPage
 end
 
 Then(/^link to the main page has text (.+)$/) do |text|
diff --git a/tests/browser/features/step_definitions/ime_steps.rb 
b/tests/browser/features/step_definitions/ime_steps.rb
index 68203db..732253a 100644
--- a/tests/browser/features/step_definitions/ime_steps.rb
+++ b/tests/browser/features/step_definitions/ime_steps.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 Given(/^I am on a wiki in Kotava language$/) do
-  visit(RandomPage)
+  visit RandomPage
   # Fake a Kotava Wiki
   @browser.execute_script( mw.config.set( 'wgContentLanguage', 'avk' ) )
 end
@@ -55,7 +55,7 @@
 end
 
 When(/^I go to another random page$/) do
-  visit(RandomPage)
+  visit RandomPage
 end
 
 Then(/^in it there must be an element with Malayalam text$/) do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34cccf69812be6e060d3f1dea1199da668e2ca31
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove unneeded () after visit - change (mediawiki...TwnMainPage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unneeded () after visit
..


Remove unneeded () after visit

Change-Id: I805869f862f6def54947d6426c26f8503f082ab3
---
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  Zfilipin: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/common_steps.rb 
b/tests/browser/features/step_definitions/common_steps.rb
index 757462f..7b7a2c3 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -9,7 +9,7 @@
 end
 
 Given(/^I am on the main page$/) do
-   visit(MainPage)
+   visit MainPage
 end
 
 When(/^I change my interface language away from English$/) do
diff --git 
a/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb 
b/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
index 2317637..65d76ae 100644
--- 
a/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
+++ 
b/tests/browser/features/step_definitions/signed_in_and_approved_user_steps.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 When(/I go to the main page$/) do
-   visit(MainPage)
+   visit MainPage
 end
 
 Then(/^I should see general statistics about the site$/) do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I805869f862f6def54947d6426c26f8503f082ab3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] adjusting gitreview to the development branch - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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


Change subject: adjusting gitreview to the development branch
..

adjusting gitreview to the development branch

Change-Id: I85f1ea238d1c6c5bd6df0131d0e2b335d0071785
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/06/97906/1

diff --git a/.gitreview b/.gitreview
index d34bcfb..fea01e0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Math.git
-defaultbranch=master
+defaultbranch=dev

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85f1ea238d1c6c5bd6df0131d0e2b335d0071785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] adjusting gitreview to the development branch - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: adjusting gitreview to the development branch
..


adjusting gitreview to the development branch

Change-Id: I85f1ea238d1c6c5bd6df0131d0e2b335d0071785
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Physikerwelt: Verified; Looks good to me, approved



diff --git a/.gitreview b/.gitreview
index d34bcfb..fea01e0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Math.git
-defaultbranch=master
+defaultbranch=dev

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85f1ea238d1c6c5bd6df0131d0e2b335d0071785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
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] Remove unneeded () after visit - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unneeded () after visit
..


Remove unneeded () after visit

Change-Id: Id17f5783fce2b8245ba9b5b8147e64f6daf8b18e
---
M tests/browser/features/step_definitions/translation_stash_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Siebrand: Looks good to me, approved
  Zfilipin: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/translation_stash_steps.rb 
b/tests/browser/features/step_definitions/translation_stash_steps.rb
index 6d696e7..d77573d 100644
--- a/tests/browser/features/step_definitions/translation_stash_steps.rb
+++ b/tests/browser/features/step_definitions/translation_stash_steps.rb
@@ -30,7 +30,7 @@
 end
 
 When(/^I reload the page$/) do
-   visit(StashPage)
+   visit StashPage
 end
 
 Then(/^I can open and see my earlier translation$/) do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id17f5783fce2b8245ba9b5b8147e64f6daf8b18e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add frame parameters in renderFunction - change (mediawiki...Foxway)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: add frame parameters in renderFunction
..


add frame parameters in renderFunction

Change-Id: Ib4591791faee6741d605e7adb903b4d710f4347f
---
M Foxway.body.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/Foxway.body.php b/Foxway.body.php
index 4ffbcff..2e43cfc 100644
--- a/Foxway.body.php
+++ b/Foxway.body.php
@@ -46,11 +46,11 @@
try {
$result = Foxway\Runtime::runSource(
$command,
-   
array($frame-getTitle()-getPrefixedText()),
-   self::getScope($frame),
+   array_merge( 
(array)$frame-getTitle()-getPrefixedText(), $frame-getArguments() ),
+   self::getScope( $frame ),
array( 'Parser'=$parser, 
'PPFrame'=$frame )
);
-   $return = implode($result);
+   $return = implode( $result );
} catch (\Foxway\ExceptionFoxway $exc) {
$return = (string) $exc;
} catch (Exception $exc) {
@@ -83,8 +83,8 @@
try {
$result = Foxway\Runtime::runSource(
$input,
-   
array_merge((array)$frame-getTitle()-getPrefixedText(),$frame-getArguments()),
-   self::getScope($frame),
+   array_merge( 
(array)$frame-getTitle()-getPrefixedText(), $frame-getArguments() ),
+   self::getScope( $frame ),
array( 'Parser'=$parser, 
'PPFrame'=$frame )
);
} catch ( \Foxway\ExceptionFoxway $exc ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4591791faee6741d605e7adb903b4d710f4347f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Foxway
Gerrit-Branch: develop
Gerrit-Owner: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Improved CdbException handling - change (mediawiki...Babel)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Improved CdbException handling
..


Improved CdbException handling

Change-Id: I1d3de72238ee788834abaa2d517c7975dc4986ac
---
M BabelLanguageCodes.class.php
M txt2cdb.php
2 files changed, 41 insertions(+), 23 deletions(-)

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



diff --git a/BabelLanguageCodes.class.php b/BabelLanguageCodes.class.php
index 2ca7bf8..59ba675 100644
--- a/BabelLanguageCodes.class.php
+++ b/BabelLanguageCodes.class.php
@@ -31,8 +31,14 @@
return $code;
}
 
-   $codesCdb = CdbReader::open( $wgBabelLanguageCodesCdb );
-   $codes = $codesCdb-get( $code );
+   $codes = false;
+   try {
+   $codesCdb = CdbReader::open( $wgBabelLanguageCodesCdb );
+   $codes = $codesCdb-get( $code );
+   } catch ( CdbException $e ) {
+   wfDebug( __METHOD__ . : CdbException caught, error 
message was 
+   . $e-getMessage() );
+   }
wfProfileOut( __METHOD__ );
 
return $codes;
@@ -68,8 +74,14 @@
return $names[$code];
}
 
-   $namesCdb = CdbReader::open( $wgBabelLanguageNamesCdb );
-   $codes = $namesCdb-get( $code );
+   $codes = false;
+   try {
+   $namesCdb = CdbReader::open( $wgBabelLanguageNamesCdb );
+   $codes = $namesCdb-get( $code );
+   } catch ( CdbException $e ) {
+   wfDebug( __METHOD__ . : CdbException caught, error 
message was 
+   . $e-getMessage() );
+   }
wfProfileOut( __METHOD__ );
 
return $codes;
diff --git a/txt2cdb.php b/txt2cdb.php
index 6d92a3c..8eda7ab 100644
--- a/txt2cdb.php
+++ b/txt2cdb.php
@@ -15,27 +15,33 @@
 
 $names = $dir/names.cdb;
 $codes = $dir/codes.cdb;
-$names = CdbWriter::open( $names );
-$codes = CdbWriter::open( $codes );
-
 $fr = fopen( $dir/codes.txt, 'r' );
-while ( $line = fgets( $fr ) ) {
-   // Format is code1 code2 language name
-   $line = explode( ' ', $line, 3 );
-   $iso1 = trim( $line[0] );
-   $iso3 = trim( $line[1] );
-   // Strip quotes
-   $name = substr( trim( $line[2] ), 1, -1 );
-   if ( $iso1 !== '-' ) {
-   $codes-set( $iso1, $iso1 );
-   if ( $iso3 !== '-' ) {
-   $codes-set( $iso3, $iso1 );
+
+try {
+   $names = CdbWriter::open( $names );
+   $codes = CdbWriter::open( $codes );
+
+   while ( $line = fgets( $fr ) ) {
+   // Format is code1 code2 language name
+   $line = explode( ' ', $line, 3 );
+   $iso1 = trim( $line[0] );
+   $iso3 = trim( $line[1] );
+   // Strip quotes
+   $name = substr( trim( $line[2] ), 1, -1 );
+   if ( $iso1 !== '-' ) {
+   $codes-set( $iso1, $iso1 );
+   if ( $iso3 !== '-' ) {
+   $codes-set( $iso3, $iso1 );
+   }
+   $names-set( $iso1, $name );
+   $names-set( $iso3, $name );
+   } elseif ( $iso3 !== '-' ) {
+   $codes-set( $iso3, $iso3 );
+   $names-set( $iso3, $name );
}
-   $names-set( $iso1, $name );
-   $names-set( $iso3, $name );
-   } elseif ( $iso3 !== '-' ) {
-   $codes-set( $iso3, $iso3 );
-   $names-set( $iso3, $name );
}
+} catch ( CdbException $e ) {
+   throw new MWException( $e-getMessage() );
 }
+
 fclose( $fr );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d3de72238ee788834abaa2d517c7975dc4986ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Using his and her instead of their - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Using his and her instead of their
..


Using his and her instead of their

Change-Id: I37d92c83376f0af9c4f74a9f873f2995daa84acf
---
M Flow.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Werdna: Looks good to me, but someone else must approve
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Flow.i18n.php b/Flow.i18n.php
index ddc7fc2..8fd2971 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -143,7 +143,7 @@
'flow-notification-edit-bundle' = '$1 and $5 
{{PLURAL:$6|other|others}} {{GENDER:$1|edited}} a [$4 post] in $2 on $3.',
'flow-notification-newtopic' = '$1 {{GENDER:$1|created}} a [$5 new 
topic] on [[$2|$3]]: $4.',
'flow-notification-rename' = '$1 {{GENDER:$1|changed}} the title of 
[$2 $3] to $4 on [[$5|$6]].',
-   'flow-notification-mention' = '$1 {{GENDER:$1|mentioned}} you in their 
[$2 post] in $3 on $4.',
+   'flow-notification-mention' = '$1 {{GENDER:$1|mentioned}} you in 
{{GENDER:$1|his|her|their}} [$2 post] in $3 on $4.',
 
// Notification primary links and secondary links
'flow-notification-link-text-view-post' = 'View post',
@@ -155,7 +155,7 @@
'flow-notification-reply-email-batch-body' = '$1 {{GENDER:$1|replied}} 
to your post in $2 on $3',
'flow-notification-reply-email-batch-bundle-body' = '$1 and $4 
{{PLURAL:$5|other|others}} {{GENDER:$1|replied}} to your post in $2 on $3',
'flow-notification-mention-email-subject' = '$1 
{{GENDER:$1|mentioned}} you on $2',
-   'flow-notification-mention-email-batch-body' = '$1 
{{GENDER:$1|mentioned}} you in their post in $2 on $3',
+   'flow-notification-mention-email-batch-body' = '$1 
{{GENDER:$1|mentioned}} you in {{GENDER:$1|his|her|their}} post in $2 on 
$3',
'flow-notification-edit-email-subject' = '$1 {{GENDER:$1|edited}} your 
post',
'flow-notification-edit-email-batch-body' = '$1 {{GENDER:$1|edited}} 
your post in $2 on $3',
'flow-notification-edit-email-batch-bundle-body' = '$1 and $4 
{{PLURAL:$5|other|others}} {{GENDER:$1|edited}} a post in $2 on $3',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37d92c83376f0af9c4f74a9f873f2995daa84acf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Added or improved file documentation - change (mediawiki...ImageMap)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Added or improved file documentation
..


Added or improved file documentation

* the general file documentation was added, expanded or fixed
* added check for the initialisation of the extension

Change-Id: I04a9a22f81ca3df72d7561faae32f8792dea65e8
---
M ImageMap.i18n.php
M ImageMap.php
M ImageMap_body.php
3 files changed, 21 insertions(+), 3 deletions(-)

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



diff --git a/ImageMap.i18n.php b/ImageMap.i18n.php
index 2bffc2b..cf4e265 100644
--- a/ImageMap.i18n.php
+++ b/ImageMap.i18n.php
@@ -1,6 +1,6 @@
 ?php
 /**
- * Internationalisation file for extension FindSpam.
+ * Internationalisation file for extension ImageMap.
  *
  * @file
  * @ingroup Extensions
diff --git a/ImageMap.php b/ImageMap.php
index aa4cfa0..b263bbb 100644
--- a/ImageMap.php
+++ b/ImageMap.php
@@ -1,4 +1,20 @@
 ?php
+/**
+ * ImageMap extension - Allows clickable HTML image maps.
+ *
+ * @link https://www.mediawiki.org/wiki/Extension:ImageMap Documentation
+ *
+ * @file
+ * @ingroup Extensions
+ * @package MediaWiki
+ * @author Tim Starling
+ * @copyright (C) 2007 Tim Starling
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+   die( 'This file is a MediaWiki extension, it is not a valid entry point' );
+}
 
 $dir = __DIR__ . '/';
 $wgExtensionMessagesFiles['ImageMap'] = $dir . 'ImageMap.i18n.php';
diff --git a/ImageMap_body.php b/ImageMap_body.php
index e67b442..7b53285 100644
--- a/ImageMap_body.php
+++ b/ImageMap_body.php
@@ -1,7 +1,9 @@
 ?php
-
 /**
- * Image map extension.
+ * Main file for extension ImageMap.
+ *
+ * @file
+ * @ingroup Extensions
  *
  * Syntax:
  * imagemap

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04a9a22f81ca3df72d7561faae32f8792dea65e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMap
Gerrit-Branch: master
Gerrit-Owner: Kghbln mediaw...@kghoffmeyer.de
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] (bug 57588) Scientific notation for quantities. - change (mediawiki...DataValues)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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


Change subject: (bug 57588) Scientific notation for quantities.
..

(bug 57588) Scientific notation for quantities.

This adds support scientific (exponent) notation to
DecimalParser and QuantityParser.

Change-Id: Iff70e26f46b10eb18b79861cc60dac8e4e15fa25
---
M DataValuesCommon/src/DataValues/DecimalMath.php
M DataValuesCommon/src/ValueParsers/DecimalParser.php
M DataValuesCommon/src/ValueParsers/QuantityParser.php
M DataValuesCommon/tests/DataValues/DecimalMathTest.php
M DataValuesCommon/tests/ValueParsers/DecimalParserTest.php
M DataValuesCommon/tests/ValueParsers/QuantityParserTest.php
6 files changed, 156 insertions(+), 5 deletions(-)


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

diff --git a/DataValuesCommon/src/DataValues/DecimalMath.php 
b/DataValuesCommon/src/DataValues/DecimalMath.php
index 9930146..4ec0c6c 100644
--- a/DataValuesCommon/src/DataValues/DecimalMath.php
+++ b/DataValuesCommon/src/DataValues/DecimalMath.php
@@ -482,7 +482,7 @@
$slumped = substr( $value, 0, $i ) . $slumped;
 
// strip leading zeros
-   $slumped = preg_replace( '/^([-+])(0+)([0-9]+(\.|$))/', '\1\3', 
$slumped );
+   $slumped = $this-stripLeadingZeros( $slumped );
 
if ( $slumped === '-0' ) {
$slumped = '+0';
@@ -490,4 +490,60 @@
 
return $slumped;
}
+
+   /**
+* @param string $digits
+*
+* @return string
+*/
+   protected function stripLeadingZeros( $digits ) {
+   $digits = preg_replace( '/^([-+])(0+)([0-9]+(\.|$))/', '\1\3', 
$digits );
+   return $digits;
+   }
+
+   /**
+* Shift the decimal point according to the given exponent.
+*
+* @param DecimalValue $decimal
+* @param int $exponent The exponent to apply (digits to shift by). A 
Positive exponent
+* shifts the decimal point to the right, a negative exponent shifts to 
the left.
+*
+* @throws \InvalidArgumentException
+* @return DecimalValue
+*/
+   public function shift( DecimalValue $decimal, $exponent ) {
+   if ( !is_int( $exponent ) ) {
+   throw new \InvalidArgumentException( '$exponent must be 
an integer' );
+   }
+
+   if ( $exponent == 0 ) {
+   return $decimal;
+   }
+
+   $sign = $decimal-getSign();
+   $intPart = $decimal-getIntegerPart();
+   $fractPart = $decimal-getFractionalPart();
+
+   if ( $exponent  0 ) {
+   // shift left
+   if ( -$exponent  strlen( $intPart ) ) {
+   $intPart = substr( $intPart, 0, -$exponent ) . 
'.' . substr( $intPart, -$exponent );
+   } else {
+   $intPart = '0.' . str_pad( $intPart, 
-$exponent, '0', STR_PAD_LEFT );
+   }
+   } else {
+   // shift right
+   if ( $exponent  strlen( $fractPart ) ) {
+   $fractPart = substr( $fractPart, 0, $exponent ) 
. '.' . substr( $fractPart, $exponent );
+   } else {
+   $fractPart = str_pad( $fractPart, $exponent, 
'0', STR_PAD_RIGHT );
+   }
+   }
+
+   // assemble result
+   $digits = $sign . $intPart . $fractPart;
+   $digits = $this-stripLeadingZeros( $digits );
+
+   return new DecimalValue( $digits );
+   }
 }
diff --git a/DataValuesCommon/src/ValueParsers/DecimalParser.php 
b/DataValuesCommon/src/ValueParsers/DecimalParser.php
index 5d8e548..bc72ed8 100644
--- a/DataValuesCommon/src/ValueParsers/DecimalParser.php
+++ b/DataValuesCommon/src/ValueParsers/DecimalParser.php
@@ -2,6 +2,7 @@
 
 namespace ValueParsers;
 
+use DataValues\DecimalMath;
 use DataValues\DecimalValue;
 use DataValues\IllegalValueException;
 
@@ -16,13 +17,29 @@
 class DecimalParser extends StringValueParser {
 
/**
+* @var DecimalMath
+*/
+   private $math;
+
+   /**
+* @return DecimalMath
+*/
+   private function getMath() {
+   if ( $this-math === null ) {
+   $this-math = new DecimalMath();
+   }
+
+   return $this-math;
+   }
+
+   /**
 * Creates a DecimalValue from a given string.
 *
 * The decimal notation for the value is based on ISO 31-0, with some 
modifications:
 * - the decimal separator is '.' (period). Comma is not used anywhere.
 * - leading and trailing as well as any internal 

[MediaWiki-commits] [Gerrit] Simplify interlanguage links creation by early return - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Simplify interlanguage links creation by early return
..


Simplify interlanguage links creation by early return

Change-Id: I023ac75ec7bce1996da50af78912dc990e69ad4d
---
M includes/SkinTemplate.php
1 file changed, 39 insertions(+), 37 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  Jack Phoenix: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 414312a..7647e51 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -130,51 +130,53 @@
 */
public function getLanguages() {
global $wgHideInterlanguageLinks;
+   if ( $wgHideInterlanguageLinks ) {
+   return array();
+   }
+
$out = $this-getOutput();
$userLang = $this-getLanguage();
 
-   # Language links
-   $language_urls = array();
+   $languageLinks = array();
 
-   if ( !$wgHideInterlanguageLinks ) {
-   foreach ( $out-getLanguageLinks() as $languageLinkText 
) {
-   $languageLinkParts = explode( ':', 
$languageLinkText, 2 );
-   $class = 'interlanguage-link interwiki-' . 
$languageLinkParts[0];
-   unset( $languageLinkParts );
-   $languageLinkTitle = Title::newFromText( 
$languageLinkText );
-   if ( $languageLinkTitle ) {
-   $ilInterwikiCode = 
$languageLinkTitle-getInterwiki();
-   $ilLangName = 
Language::fetchLanguageName( $ilInterwikiCode );
+   foreach ( $out-getLanguageLinks() as $languageLinkText ) {
+   $languageLinkParts = explode( ':', $languageLinkText, 2 
);
+   $class = 'interlanguage-link interwiki-' . 
$languageLinkParts[0];
+   unset( $languageLinkParts );
+   $languageLinkTitle = Title::newFromText( 
$languageLinkText );
+   if ( $languageLinkTitle ) {
+   $ilInterwikiCode = 
$languageLinkTitle-getInterwiki();
+   $ilLangName = Language::fetchLanguageName( 
$ilInterwikiCode );
 
-   if ( strval( $ilLangName ) === '' ) {
-   $ilLangName = $languageLinkText;
-   } else {
-   $ilLangName = 
$this-formatLanguageName( $ilLangName );
-   }
-
-   // CLDR extension or similar is 
required to localize the language name;
-   // otherwise we'll end up with the 
autonym again.
-   $ilLangLocalName = 
Language::fetchLanguageName( $ilInterwikiCode, $userLang-getCode() );
-
-   if ( $languageLinkTitle-getText() === 
'' ) {
-   $ilTitle = wfMessage( 
'interlanguage-link-title-langonly', $ilLangLocalName )-text();
-   } else {
-   $ilTitle = wfMessage( 
'interlanguage-link-title', $languageLinkTitle-getText(),
-   $ilLangLocalName 
)-text();
-   }
-
-   $language_urls[] = array(
-   'href' = 
$languageLinkTitle-getFullURL(),
-   'text' = $ilLangName,
-   'title' = $ilTitle,
-   'class' = $class,
-   'lang' = wfBCP47( 
$ilInterwikiCode ),
-   'hreflang' = wfBCP47( 
$ilInterwikiCode ),
-   );
+   if ( strval( $ilLangName ) === '' ) {
+   $ilLangName = $languageLinkText;
+   } else {
+   $ilLangName = 
$this-formatLanguageName( $ilLangName );
}
+
+   // CLDR extension or similar is required to 
localize the language name;
+   // otherwise we'll end up with the autonym 
again.
+   $ilLangLocalName = Language::fetchLanguageName( 
$ilInterwikiCode, $userLang-getCode() );
+
+   if ( 

[MediaWiki-commits] [Gerrit] Removed 'Disable browser page caching user preference - change (mediawiki/core)

[01tonythomas (Code Review)]

01tonythomas has uploaded a new change for review.

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


Change subject: Removed 'Disable browser page caching user preference
..

Removed 'Disable browser page caching user preference

It is  a very advanced user preference with little usage and is often 
misleading.

Bug: 52809
Change-Id: Ibb23f5b7dfa8a7ae20e862720cd1d7af3bddf765
---
M includes/Preferences.php
M languages/messages/MessagesEn.php
2 files changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/97908/1

diff --git a/includes/Preferences.php b/includes/Preferences.php
index c9caf4f..f92413a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -756,11 +756,6 @@
'label-message' = 'tog-showtoc',
);
}
-   $defaultPreferences['nocache'] = array(
-   'type' = 'toggle',
-   'label-message' = 'tog-nocache',
-   'section' = 'rendering/advancedrendering',
-   );
$defaultPreferences['showhiddencats'] = array(
'type' = 'toggle',
'section' = 'rendering/advancedrendering',
diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 2baccf5..7988fd4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -676,7 +676,6 @@
 'tog-minordefault'= 'Mark all edits minor by default',
 'tog-previewontop'= 'Show preview before edit box',
 'tog-previewonfirst'  = 'Show preview on first edit',
-'tog-nocache' = 'Disable browser page caching',
 'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist 
is changed',
 'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',
 'tog-enotifminoredits'= 'Email me also for minor edits of pages and 
files',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb23f5b7dfa8a7ae20e862720cd1d7af3bddf765
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com

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

[MediaWiki-commits] [Gerrit] Document the block duration tooltip - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Document the block duration tooltip
..


Document the block duration tooltip

This is a follow-up to I31aef50196319be7355ad14657e67ca23fc15e20.

Change-Id: If0abba018fe59a289c2ae82e9e5b91459dd4baf6
---
M includes/logging/LogPage.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php
index cc473c1..bdae366 100644
--- a/includes/logging/LogPage.php
+++ b/includes/logging/LogPage.php
@@ -262,7 +262,12 @@
// User suppression
if ( preg_match( 
'/^(block|suppress)\/(block|reblock)$/', $key ) ) {
if ( $skin ) {
-   $params[1] = 'span 
class=blockExpiry title=lrm;' . htmlspecialchars( $params[1] ) . '' .
+   // Localize the 
duration, and add a tooltip
+   // in English to help 
visitors from other wikis.
+   // The lrm is needed to 
make sure that the number
+   // is shown on the 
correct side of the tooltip text.
+   $durationTooltip = 
'lrm;' . htmlspecialchars( $params[1] );
+   $params[1] = span 
class='blockExpiry' title='$durationTooltip' .

$wgLang-translateBlockExpiry( $params[1] ) . '/span';
} else {
$params[1] = 
$wgContLang-translateBlockExpiry( $params[1] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0abba018fe59a289c2ae82e9e5b91459dd4baf6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] i18n: fix flow-rev-message-reply-bundle - change (mediawiki...Flow)

[Shirayuki (Code Review)]

Shirayuki has uploaded a new change for review.

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


Change subject: i18n: fix flow-rev-message-reply-bundle
..

i18n: fix flow-rev-message-reply-bundle

* Replace unused parameter $2 by $1
Follow-up to: I1685ef364d7c807c7946973511317ee9cd93e6c8

Change-Id: I1badb1b0c04136e509e27692d06731945ed7e329
---
M Flow.i18n.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/09/97909/1

diff --git a/Flow.i18n.php b/Flow.i18n.php
index 980bd8d..30fdb16 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -100,7 +100,7 @@
 
'flow-rev-message-edit-post' = '$1 {{GENDER:$2|edited}} a [$3 
comment].',
'flow-rev-message-reply' = '$1 {{GENDER:$2|added}} a [$3 comment].',
-   'flow-rev-message-reply-bundle' = '''$1 
{{PLURAL:$2|comment|comments}}''' {{PLURAL:$2|was|were}} added.,
+   'flow-rev-message-reply-bundle' = '''$1 
{{PLURAL:$1|comment|comments}}''' {{PLURAL:$1|was|were}} added.,
'flow-rev-message-new-post' = '$1 {{GENDER:$2|created}} the topic [$3 
$4].',
'flow-rev-message-edit-title' = '$1 {{GENDER:$2|changed}} the topic 
title from $5 to [$3 $4].',
 
@@ -442,7 +442,6 @@
 
 Parameters:
 * $1 - the amount of replies posted
-* $2 - ...
 {{Related|Flow-rev-message}},
'flow-rev-message-new-post' = 'Used as revision comment when the topic 
has been created.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1badb1b0c04136e509e27692d06731945ed7e329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com

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

[MediaWiki-commits] [Gerrit] jquery.makeCollapsible: Remove useless debug logging - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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


Change subject: jquery.makeCollapsible: Remove useless debug logging
..

jquery.makeCollapsible: Remove useless debug logging

Custom togglers are nowhere near exciting enough to log the fact that
we're looking for them.

Added ages ago in r78989 when this script was more hairy.

Change-Id: Ieec216e5f203f4d808194733d96dcb3ebe9aaf9b
---
M resources/jquery/jquery.makeCollapsible.js
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/97911/1

diff --git a/resources/jquery/jquery.makeCollapsible.js 
b/resources/jquery/jquery.makeCollapsible.js
index 30be2bd..60c0afc 100644
--- a/resources/jquery/jquery.makeCollapsible.js
+++ b/resources/jquery/jquery.makeCollapsible.js
@@ -15,8 +15,6 @@
  * @license GPL2 http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  */
 ( function ( $, mw ) {
-   var lpx = 'jquery.makeCollapsible ';
-
/**
 * Handler for a click on a collapsible toggler.
 *
@@ -292,17 +290,11 @@
} else {
collapsibleId = $collapsible.attr( 'id' ) || '';
if ( collapsibleId.indexOf( 
'mw-customcollapsible-' ) === 0 ) {
-   mw.log( lpx + 'Found custom 
collapsible: #' + collapsibleId );
$customTogglers = $( '.' + 
collapsibleId.replace( 'mw-customcollapsible', 'mw-customtoggle' ) );
-
-   // Double check that there is actually 
a customtoggle link
-   if ( !$customTogglers.length ) {
-   mw.log( lpx + '#' + 
collapsibleId + ': Missing toggler!' );
-   }
}
}
 
-   // Bind the togglers
+   // Add event handlers to custom togglers or create our 
own ones
if ( $customTogglers  $customTogglers.length ) {
actionHandler = function ( e, opts ) {
var defaultOpts = {};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieec216e5f203f4d808194733d96dcb3ebe9aaf9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] jquery.spinner: Fix documentation formatting - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: jquery.spinner: Fix documentation formatting
..


jquery.spinner: Fix documentation formatting

This syntax is a really fickle beast.

Plus assorted doc fixes.

Change-Id: I1dc2cdc2244db8499bd3f10377b6076955b9765b
---
M resources/jquery/jquery.spinner.js
1 file changed, 29 insertions(+), 22 deletions(-)

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



diff --git a/resources/jquery/jquery.spinner.js 
b/resources/jquery/jquery.spinner.js
index 27dabc6..1cd6ff0 100644
--- a/resources/jquery/jquery.spinner.js
+++ b/resources/jquery/jquery.spinner.js
@@ -19,39 +19,46 @@
/**
 * Create a spinner element
 *
-* The argument is an object with options used to construct the 
spinner. These can be:
+* The argument is an object with options used to construct the 
spinner (see below).
 *
-* It is a good practice to keep a reference to the created 
spinner to be able to remove it later.
-* Alternatively one can use the id option and #removeSpinner 
(but make sure to choose an id
-* that's unlikely to cause conflicts, e.g. with extensions, 
gadgets or user scripts).
+* It is a good practice to keep a reference to the created 
spinner to be able to remove it
+* later. Alternatively, one can use the 'id' option and 
#removeSpinner (but make sure to choose
+* an id that's unlikely to cause conflicts, e.g. with 
extensions, gadgets or user scripts).
 *
 * CSS classes used:
+*
 * - .mw-spinner for every spinner
 * - .mw-spinner-small / .mw-spinner-large for size
 * - .mw-spinner-block / .mw-spinner-inline for display types
 *
-*   // Create a large spinner reserving all available 
horizontal space.
-*   var $spinner = $.createSpinner({ size: 'large', type: 
'block' });
-*   // Insert above page content.
-*   $( '#mw-content-text' ).prepend( $spinner );
+* Example:
 *
-*   // Place a small inline spinner next to the Save button
-*   var $spinner = $.createSpinner({ size: 'small', type: 
'inline' });
-*   // Alternatively, just `$.createSpinner();` as these are 
the default options.
-*   $( '#wpSave' ).after( $spinner );
+* // Create a large spinner reserving all available 
horizontal space.
+* var $spinner = $.createSpinner({ size: 'large', type: 
'block' });
+* // Insert above page content.
+* $( '#mw-content-text' ).prepend( $spinner );
 *
-*   // The following two are equivalent:
-*   $.createSpinner( 'magic' );
-*   $.createSpinner({ id: 'magic' });
+* // Place a small inline spinner next to the Save button
+* var $spinner = $.createSpinner({ size: 'small', type: 
'inline' });
+* // Alternatively, just `$.createSpinner();` as these are 
the default options.
+* $( '#wpSave' ).after( $spinner );
+*
+* // The following two are equivalent:
+* $.createSpinner( 'magic' );
+* $.createSpinner({ id: 'magic' });
 *
 * @static
 * @inheritable
-* @param {Object|string} [opts] ID string or options:
-*  - id: If given, spinner will be given an id of 
mw-spinner-{id}
-*  - size: 'small' (default) or 'large' for a 20-pixel or 
32-pixel spinner
-*  - type: 'inline' (default) or 'block'. Inline creates an 
inline-block with width and
-*height equal to spinner size. Block is a block-level 
element with width 100%, height
-*equal to spinner size.
+* @param {Object|string} [opts] Options. An object with the 
following keys:
+*
+* - id: If given, spinner will be given an id of 
mw-spinner-{id}
+* - size: 'small' (default) or 'large' for a 20-pixel or 
32-pixel spinner
+* - type: 'inline' (default) or 'block'. Inline creates an 
inline-block with width and
+*   height equal to spinner size. Block is a block-level 
element with width 100%, height
+*   equal to spinner size.
+*
+* If a string is given, it will be treated as the value of the 
'id' option.
+*
 * @return {jQuery}
 */
  

[MediaWiki-commits] [Gerrit] Tear down the save dialog and remove it from memory on surfa... - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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


Change subject: Tear down the save dialog and remove it from memory on surface 
teardown
..

Tear down the save dialog and remove it from memory on surface teardown

Otherwise the old save dialog will still be around if the user sets up
another surface (e.g. a second edit), but won't be attached to the DOM.

Bug: 57654
Change-Id: I23c10849a212534bdd0600637d8ad4fa3ebc4fb7
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 4997157..c8c7cb1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -195,11 +195,6 @@
this.detachToolbarButtons();
}
 
-   if ( this.saveDialog ) {
-   // If we got as far as setting up the save 
dialog, tear it down
-   this.saveDialog.reset();
-   this.saveDialog.close();
-   }
// Check we got as far as setting up the surface
if ( this.active ) {
// If we got as far as setting up the surface, 
tear that down
@@ -1062,6 +1057,12 @@
}
this.tearDownToolbar();
this.restoreDocumentTitle();
+   if ( this.saveDialog ) {
+   // If we got as far as setting up the save dialog, tear it down
+   this.saveDialog.close();
+   this.saveDialog.teardown();
+   this.saveDialog = null;
+   }
// Destroy surface
if ( this.surface ) {
this.surface.destroy();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23c10849a212534bdd0600637d8ad4fa3ebc4fb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] comment out parsoid-server-sanity-check - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: comment out parsoid-server-sanity-check
..


comment out parsoid-server-sanity-check

parsoid-server-sanity-check definition has been commented out entirely
but was still being released in a jobs list.  Recent version of JJB
would raise an error since it cant find the template.

Change-Id: Ie90fd99edb7152899932dbce9f7c679df180b2a2
---
M parsoid.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/parsoid.yaml b/parsoid.yaml
index 6052950..60f1446 100644
--- a/parsoid.yaml
+++ b/parsoid.yaml
@@ -307,7 +307,7 @@
 - parsoid-parsertests
 - parsoid-parsertests-run
 - parsoid-regressions
-- parsoid-server-sanity-check
+#- parsoid-server-sanity-check
 - parsoid-parse-tool-check
 - parsoid-roundtrip-test-check
 - parsoid-parsertests-run-harder

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie90fd99edb7152899932dbce9f7c679df180b2a2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] TUX refactoring for performance - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: TUX refactoring for performance
..

TUX refactoring for performance

ApiQueryMessageGroups: root parameter can now be used together with
format=flat and then it only returns that group.

JavaScript changes:

mw.translate.loadMessageGroups has been removed.

mw.translate.getMessageGroup now takes second parameter for props to load.

mw.translate.getGroup has been renamed to mw.translate.findGroup and the
second parameter is no longer optional. It is also now in the base module
ext.translate.base.

Module ext.translate.groupselector was refactored to load group data
itself to improve performance. It's still loading the priority*
properties which are among the slowed properties to load currently.

Module ext.translate.special.translate was refactored to load data only
for the currently selected group to improve performance.

Change-Id: I2f83cd0666386745820b0fd665c2cba703bbd560
---
M Resources.php
M api/ApiQueryMessageGroups.php
M resources/js/ext.translate.base.js
M resources/js/ext.translate.groupselector.js
M resources/js/ext.translate.special.searchtranslations.js
M resources/js/ext.translate.special.translate.js
M resources/js/ext.translate.workflowselector.js
M specials/SpecialSearchTranslations.php
8 files changed, 204 insertions(+), 206 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 7366092..c13ff66 100644
--- a/Resources.php
+++ b/Resources.php
@@ -315,6 +315,7 @@
'ext.uls.mediawiki',
'ext.uls.geoclient',
'ext.translate.groupselector',
+   'mediawiki.Uri',
),
'messages' = array(
'translate-documentation-language',
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 4fe23ac..68b99bd 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -27,9 +27,13 @@
 
$groups = array();
if ( $params['format'] === 'flat' ) {
-   $groups = MessageGroups::getAllGroups();
-   foreach ( MessageGroups::getDynamicGroups() as $id = 
$unused ) {
-   $groups[$id] = MessageGroups::getGroup( $id );
+   if ( $params['root'] !== '' ) {
+   $groups[$id] = MessageGroups::getGroup( 
$params['root'] );
+   } else {
+   $groups = MessageGroups::getAllGroups();
+   foreach ( MessageGroups::getDynamicGroups() as 
$id = $unused ) {
+   $groups[$id] = MessageGroups::getGroup( 
$id );
+   }
}
 
// Not sorted by default, so do it now
@@ -276,7 +280,8 @@
 TEXT;
$root = TEXT
 When using the tree format, instead of starting from top level start from the
-given message group, which must be an aggregate message group.
+given message group, which must be an aggregate message group. When using flat
+format only the specified group is returned.
 TEXT;
$filter = TEXT
 Only return messages with IDs that match one or more of the input(s) given
diff --git a/resources/js/ext.translate.base.js 
b/resources/js/ext.translate.base.js
index 71cd409..e1a3dc9 100644
--- a/resources/js/ext.translate.base.js
+++ b/resources/js/ext.translate.base.js
@@ -22,9 +22,7 @@
// Storage for language stats loader functions from API,
// indexed by language code
languageStatsLoader: {},
-   messageGroupsLoader: null,
 
-   messageGroups: {},
/**
 * Get language stats for a language from the API.
 * @param {string} language Language code.
@@ -48,45 +46,73 @@
},
 
/**
-* Loads information about all message groups. Use 
getMessageGroup
-* instead.
+* Load message group information asynchronously.
 *
-* @return {jQuery.Deferred}
+* @param {string} id Message group id
+* @param {string|array} [props] List of properties to load
+* @return {jQuery.Promise} Object containing the requested 
properties on success.
 */
-   loadMessageGroups: function () {
-   if ( mw.translate.messageGroupsLoader ) {
-   return mw.translate.messageGroupsLoader;
+   getMessageGroup: function ( id, props ) {
+   var params,
+   deferred = new $.Deferred();
+
+   if ( $.isArray( 

[MediaWiki-commits] [Gerrit] Remove lightbox entries from history when closing - change (mediawiki...MultimediaViewer)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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


Change subject: Remove lightbox entries from history when closing
..

Remove lightbox entries from history when closing

Attempt to clean up history when closing the box, so that
the user does not need to navigate back through dozens of artificial
history entries when trying to go back to the previous page.

When the history entry in which the user opened the lightbox was not
the first entry in that document (e.g. the user navigated through the
TOC first), we can clean up perfectly. When it was the first entry,
an artificial future entry is left (i.e. the forward button of the
user's browser will be active, even though he never used the back
button). This could be confusing, but - as far as I can see -
impossible to avoid.

The patch is intended as a demonstration of the idea; if it is
accepted as the right way to go, the implementation needs to be fixed.

Change-Id: Ib247229e9da0df614239af72aa47772d8736772f
---
M resources/ext.multimediaViewer/ext.multimediaViewer.js
1 file changed, 33 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/19/97919/1

diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js 
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 9b306e1..08a6814 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -53,7 +53,9 @@
'defullscreen-link-click': 'User clicked on button to 
return to normal lightbox view.',
'close-link-click': 'User clicked on the lightbox close 
button.',
'site-link-click': 'User clicked on the link to the 
file description page.'
-   };
+   },
+
+   historyStart = history.length;
 
function MultimediaViewer() {
var $thumbs = $( '.gallery .image img, a.image img' ),
@@ -127,7 +129,36 @@
this.$nextButton.add( this.$prevButton ).css( 'top', 
'-999px' );
$( document.body ).removeClass( 'mw-mlb-lightbox-open' 
);
if ( comingFromPopstate === false ) {
-   history.pushState( {}, '', '#' );
+   // go back to last state before opening the 
lightbox
+   while ( history.state  history.state.mmv ) {
+   history.back();
+   }
+
+   // find out current history position compared 
to first entry of this document
+   // this is only intended as a proof of contect 
and will probably not work
+   // e.g. when arriving to the document by 
backnavigation, but could be made
+   // more robust easily, e.g. by pushing a flag 
in the first state
+   history.pushState( {}, null, '#' );
+   var historyPosition = history.length - 1;
+   history.back();
+
+   // history.back does not remove entries from 
history;
+   // if we can go back one more step wothout 
navigating away,
+   // we can remove them by doing that and pushing 
the current state
+   if ( historyPosition  historyStart ) {
+   var state = [
+   history.state, // might need to 
clone this... but at the moment nothing uses it anyway
+   document.title,
+   location.toString()
+   ];
+   history.back();
+   history.pushState.apply( history, state 
);
+   } else {
+   // no way to drop all entries after 
this one :-(
+   // at least replace them with a single 
one
+   history.pushState( {}, null, '#' );
+   history.back();
+   }
} else {
comingFromPopstate = false;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib247229e9da0df614239af72aa47772d8736772f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

[MediaWiki-commits] [Gerrit] [browser test] more shuffling of elements among iframes - change (mediawiki...VisualEditor)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

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


Change subject: [browser test] more shuffling of elements among iframes
..

[browser test] more shuffling of elements among iframes

Change-Id: I1a60e2370fc436702d983705d7360563f5483242
---
M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/22/97922/1

diff --git 
a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
index 4d56bc9..cab5015 100644
--- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
@@ -45,17 +45,10 @@
   span(:transclusion, class: 'oo-ui-iconedElement-icon oo-ui-icon-template')
 
   in_frame(:index = 0) do |frame|
-div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: 
frame)
 a(:beta_warning, title: 'Close', frame: frame)
-text_area(:describe_change, index: 0, frame: frame)
-div(:diff_view, class: 've-ui-mwSaveDialog-viewer', frame: frame)
-a(:ex, title: 'Close', frame: frame)
+div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: 
frame)
 span(:leftarrowclose, class: 'oo-ui-iconedElement-icon 
oo-ui-icon-previous', frame: frame)
 text_field(:link_textfield, index: 0, frame: frame)
-checkbox(:minor_edit, id: 'wpMinoredit', frame: frame)
-span(:return_to_save, class: 'oo-ui-labeledElement-label', text: 'Return 
to save form', frame: frame)
-span(:review_changes, class: 'oo-ui-labeledElement-label', text: 'Review 
your changes', frame: frame)
-span(:second_save_page, class: 'oo-ui-labeledElement-label', text: 'Save 
page', frame: frame)
 list_item(:template_list_item, text: 'S', frame: frame)
 div(:ve_link_ui, class: 'oo-ui-window-head', frame: frame)
   end
@@ -65,10 +58,17 @@
 span(:add_template, text: 'Add template', frame: frame)
 span(:apply_changes, text: 'Apply changes', frame: frame)
 div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: 
frame)
+text_area(:describe_change, index: 0, frame: frame)
+div(:diff_view, class: 've-ui-mwSaveDialog-viewer', frame: frame)
+a(:ex, title: 'Close', frame: frame)
 span(:insert_reference, text: 'Insert reference', frame: frame)
+checkbox(:minor_edit, id: 'wpMinoredit', frame: frame)
 text_field(:parameter_box, index: 0, frame: frame)
 span(:remove_parameter, text: 'Remove parameter', frame: frame)
 span(:remove_template, text: 'Remove template', frame: frame)
+span(:return_to_save, class: 'oo-ui-labeledElement-label', text: 'Return 
to save form', frame: frame)
+span(:review_changes, class: 'oo-ui-labeledElement-label', text: 'Review 
your changes', frame: frame)
+span(:second_save_page, class: 'oo-ui-labeledElement-label', text: 'Save 
page', frame: frame)
 unordered_list(:suggestion_list, class: 'oo-ui-widget oo-ui-selectWidget 
oo-ui-clippableElement-clippable oo-ui-menuWidget oo-ui-textInputMenuWidget 
oo-ui-lookupWidget-menu ve-ui-mwTitleInputWidget-menu', frame: frame)
 div(:title, class: 'oo-ui-window-title', frame: frame)
 text_area(:transclusion_textarea, index: 0, frame: frame)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a60e2370fc436702d983705d7360563f5483242
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Desktop: Add Vector specific Special:Nearby tweaks - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Desktop: Add Vector specific Special:Nearby tweaks
..


Desktop: Add Vector specific Special:Nearby tweaks

It seems in Vector in Firefox since our reset is not applied
the lists can be badly styled with bullet points and
 with a margin (our reset is not applied)
I'd rather not tarnish our own less file so adding a minor less file
to combat this.

Bug: 57446
Change-Id: I15ed91662140ff131931f8ef40b1336bea2c83e8
(cherry picked from commit f0332c70fa73b69416e06fe7a64467979a979e7e)
---
M includes/Resources.php
A less/desktop/special/nearby.less
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index c3f1033..e7c860b 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -905,6 +905,9 @@
'styles' = array(
'less/specials/nearby.less',
),
+   'skinStyles' = array(
+   'vector' = 'less/desktop/special/nearby.less',
+   ),
),
 
// FIXME: Merge with mobile.nearby when geonotahack moves to  stable
diff --git a/less/desktop/special/nearby.less b/less/desktop/special/nearby.less
new file mode 100644
index 000..6565dee
--- /dev/null
+++ b/less/desktop/special/nearby.less
@@ -0,0 +1,5 @@
+// These rules are specifically for Special:Nearby in the Vector skin
+.page-list {
+   list-style: none;
+   margin-left: 0;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15ed91662140ff131931f8ef40b1336bea2c83e8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Keeping track of claim index in claimview - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Keeping track of claim index in claimview
..


Keeping track of claim index in claimview

Change-Id: I40bc49535fcf4cf1ef3843b85b8e9e5f64bf6b6a
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
2 files changed, 97 insertions(+), 9 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 5b63012..24ef2f5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -90,6 +90,17 @@
var $claimview = $( event.target ),
claimview = lia.liInstance( $claimview );
 
+   if( dropValue ) {
+   // Re-order claims according to their initial 
indices:
+   var listview = self.$listview.data( 'listview' 
),
+   $claimviews = listview.items();
+
+   for( var i = 0; i  $claimviews.length; i++ ) {
+   var claimviewInstance = 
listview.listItemAdapter().liInstance( $claimviews.eq( i ) );
+   listview.move( $claimviews.eq( i ), 
claimviewInstance.getInitialIndex() );
+   }
+   }
+
// Cancelling edit mode or having stopped edit mode 
after saving an existing (not
// pending) claim.
if( dropValue || !claimview || claimview.value() ) {
@@ -114,15 +125,22 @@
 * @since 0.5
 */
_createListView: function() {
-   var listItemWidget = this._listItemWidget,
-   value = this.option( 'value' ),
+   var self = this,
+   listItemWidget = this._listItemWidget,
+   claims = this.option( 'value' ),
propertyId;
 
-   if( value ) {
-   propertyId = value[0].getMainSnak().getPropertyId();
+   if( claims ) {
+   propertyId = claims[0].getMainSnak().getPropertyId();
}
 
-   this.$listview.listview( {
+   function indexOf( element, array ) {
+   var index = $.inArray( element, array );
+   return ( index !== -1 ) ? index : null;
+   }
+
+   this.$listview
+   .listview( {
listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
listItemWidget: listItemWidget,
listItemWidgetValueAccessor: 'value',
@@ -138,12 +156,32 @@
mainSnak: {
property: 
!!propertyId
}
-   }
+   },
+   index: indexOf( value, ( claims 
|| [] ) )
};
}
} ),
-   value: ( this.option( 'value' ) ) ? this.option( 
'value' ) : null
+   value: claims || null
+   } )
+   .on( 'listviewitemadded listviewitemremoved', function( event, 
value, $li ) {
+   self._updateReferenceIndices();
} );
+
+   this._updateReferenceIndices();
+   },
+
+   /**
+   * Updates the reference view indices.
+   * @since 0.5
+   */
+   _updateReferenceIndices: function() {
+   var listview = this.$listview.data( 'listview' ),
+   $claimviews = listview.items();
+
+   for( var i = 0; i  $claimviews.length; i++ ) {
+   var claimview = listview.listItemAdapter().liInstance( 
$claimviews.eq( i ) );
+   claimview.option( 'index', i );
+   }
},
 
/**
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 2d3ada5..01a6a9a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -19,6 +19,12 @@
  * the value function doesn't work as a setter in this view. If this 
is null, this view will
  * start in edit mode, allowing the user to 

[MediaWiki-commits] [Gerrit] (bug 57646) Exclude missing entities from JS vars - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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


Change subject: (bug 57646) Exclude missing entities from JS vars
..

(bug 57646) Exclude missing entities from JS vars

Referenced items that have been deleted should not be
present in the wbUsedEntities JS variable used by EntityView.

Change-Id: I77af42488b4258ab9eb42682ac10123dd4a1d9ff
---
M lib/includes/store/EntityInfoBuilder.php
M lib/includes/store/sql/SqlEntityInfoBuilder.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
M repo/includes/EntityView.php
M repo/tests/phpunit/includes/EntityViewTest.php
7 files changed, 235 insertions(+), 16 deletions(-)


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

diff --git a/lib/includes/store/EntityInfoBuilder.php 
b/lib/includes/store/EntityInfoBuilder.php
index f084c9b..a73ee9f 100644
--- a/lib/includes/store/EntityInfoBuilder.php
+++ b/lib/includes/store/EntityInfoBuilder.php
@@ -42,4 +42,12 @@
 *with the key being the entity's ID. NOTE: This array will be 
updated!
 */
public function addDataTypes( array $entityInfo );
+
+   /**
+* Removes entries for non-existent Entities from $entityInfo.
+*
+* @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
+*with the key being the entity's ID. NOTE: This array will be 
updated!
+*/
+   public function removeMissing( array $entityInfo );
 }
diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php 
b/lib/includes/store/sql/SqlEntityInfoBuilder.php
index b0996b4..f15d0b1 100644
--- a/lib/includes/store/sql/SqlEntityInfoBuilder.php
+++ b/lib/includes/store/sql/SqlEntityInfoBuilder.php
@@ -39,6 +39,11 @@
protected $propertyInfoTable;
 
/**
+* @var string
+*/
+   protected $entityPerPageTable;
+
+   /**
 * @var EntityIdParser
 */
protected $idParser;
@@ -61,6 +66,7 @@
 
$this-termTable = 'wb_terms';
$this-propertyInfoTable = 'wb_property_info';
+   $this-entityPerPageTable = 'wb_entity_per_page';
}
 
/**
@@ -101,7 +107,7 @@
/* @var EntityId $id */
$id = $this-idParser-parse( $prefixedId );
$type = $id-getEntityType();
-   $ids[$type][] = $id-getNumericId();
+   $ids[$type][$prefixedId] = $id-getNumericId();
}
 
return $ids;
@@ -135,9 +141,7 @@
}
 
/**
-* Adds terms (like labels and/or descriptions and/or aliases) to the 
entity records in
-* $entityInfo. If no such terms are found for an entity, the 
respective field in the
-* entity records is set to array().
+* @see EntityInfoBuilder::addTerms()
 *
 * @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
 *with the key being the entity's ID. NOTE: This array will be 
updated!
@@ -271,8 +275,7 @@
}
 
/**
-* Adds property data types to the entries in $entityInfo. Missing 
Properties
-* will have their datatype field set to null. Other entities remain 
unchanged.
+* @see EntityInfoBuilder::addDataTypes()
 *
 * @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
 *with the key being the entity's ID. NOTE: This array will be 
updated!
@@ -330,4 +333,69 @@
$entityInfo[$key]['datatype'] = $row-pi_type;
}
}
+
+   /**
+* Adds property data types to the entries in $entityInfo. Missing 
Properties
+* will have their datatype field set to null. Other entities remain 
unchanged.
+*
+* @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
+*with the key being the entity's ID. NOTE: This array will be 
updated!
+*/
+   public function removeMissing( array $entityInfo ) {
+   wfProfileIn( __METHOD__ );
+
+   $entityIdsByType = $this-getNumericEntityIds( $entityInfo );
+
+   //NOTE: we make one DB query per entity type, so we can take 
advantage of the
+   //  database index on the epp_entity_type field.
+   foreach ( $entityIdsByType as $type = $idsForType ) {
+   $pageIds = $this-getPageIdsForEntities( $type, 
$idsForType );
+   $missingNumericIds = array_diff( $idsForType, 
array_keys( $pageIds ) );
+
+   // get the missing prefixed ids based on the missing 
numeric ids
+   

[MediaWiki-commits] [Gerrit] [browser test] more shuffling of elements among iframes - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: [browser test] more shuffling of elements among iframes
..


[browser test] more shuffling of elements among iframes

Change-Id: I1a60e2370fc436702d983705d7360563f5483242
---
M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git 
a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
index 4d56bc9..cab5015 100644
--- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
@@ -45,17 +45,10 @@
   span(:transclusion, class: 'oo-ui-iconedElement-icon oo-ui-icon-template')
 
   in_frame(:index = 0) do |frame|
-div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: 
frame)
 a(:beta_warning, title: 'Close', frame: frame)
-text_area(:describe_change, index: 0, frame: frame)
-div(:diff_view, class: 've-ui-mwSaveDialog-viewer', frame: frame)
-a(:ex, title: 'Close', frame: frame)
+div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: 
frame)
 span(:leftarrowclose, class: 'oo-ui-iconedElement-icon 
oo-ui-icon-previous', frame: frame)
 text_field(:link_textfield, index: 0, frame: frame)
-checkbox(:minor_edit, id: 'wpMinoredit', frame: frame)
-span(:return_to_save, class: 'oo-ui-labeledElement-label', text: 'Return 
to save form', frame: frame)
-span(:review_changes, class: 'oo-ui-labeledElement-label', text: 'Review 
your changes', frame: frame)
-span(:second_save_page, class: 'oo-ui-labeledElement-label', text: 'Save 
page', frame: frame)
 list_item(:template_list_item, text: 'S', frame: frame)
 div(:ve_link_ui, class: 'oo-ui-window-head', frame: frame)
   end
@@ -65,10 +58,17 @@
 span(:add_template, text: 'Add template', frame: frame)
 span(:apply_changes, text: 'Apply changes', frame: frame)
 div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame: 
frame)
+text_area(:describe_change, index: 0, frame: frame)
+div(:diff_view, class: 've-ui-mwSaveDialog-viewer', frame: frame)
+a(:ex, title: 'Close', frame: frame)
 span(:insert_reference, text: 'Insert reference', frame: frame)
+checkbox(:minor_edit, id: 'wpMinoredit', frame: frame)
 text_field(:parameter_box, index: 0, frame: frame)
 span(:remove_parameter, text: 'Remove parameter', frame: frame)
 span(:remove_template, text: 'Remove template', frame: frame)
+span(:return_to_save, class: 'oo-ui-labeledElement-label', text: 'Return 
to save form', frame: frame)
+span(:review_changes, class: 'oo-ui-labeledElement-label', text: 'Review 
your changes', frame: frame)
+span(:second_save_page, class: 'oo-ui-labeledElement-label', text: 'Save 
page', frame: frame)
 unordered_list(:suggestion_list, class: 'oo-ui-widget oo-ui-selectWidget 
oo-ui-clippableElement-clippable oo-ui-menuWidget oo-ui-textInputMenuWidget 
oo-ui-lookupWidget-menu ve-ui-mwTitleInputWidget-menu', frame: frame)
 div(:title, class: 'oo-ui-window-title', frame: frame)
 text_area(:transclusion_textarea, index: 0, frame: frame)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a60e2370fc436702d983705d7360563f5483242
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Implemented movetoolbar for claimviews in claimlistview - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Implemented movetoolbar for claimviews in claimlistview
..


Implemented movetoolbar for claimviews in claimlistview

The movetoolbar implemented in the claimlistview widget enables moving 
claims/statements
within their claimgroups.

Change-Id: I52071c9d9c7743504df2d6372776132a0d21291d
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M repo/resources/wikibase.ui.entityViewInit.js
2 files changed, 87 insertions(+), 0 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 24ef2f5..04af396 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -414,4 +414,90 @@
}
 } );
 
+$.wikibase.toolbarcontroller.definition( 'movetoolbar', {
+   id: 'claimlistview-claimview',
+   selector: '.wb-claimview',
+   events: {
+   'claimviewstartediting statementviewstartediting': function( 
event ) {
+   // Initialize movetoolbar.
+
+   var $claimview = $( event.target ),
+   $claimlistview = $claimview.closest( 
':wikibase-claimlistview' ),
+   claimlistview = $claimlistview.data( 
'claimlistview' ),
+   claimlistviewListview = 
claimlistview.$listview.data( 'listview' );
+
+   $claimview.movetoolbar();
+
+   // Disable move up button of topmost and move down 
button of bottommost
+   // referenceview:
+   var $topMostReferenceview = 
claimlistviewListview.items().first();
+   var $bottomMostReferenceview = 
claimlistviewListview.items().last();
+
+   if ( $topMostReferenceview.get( 0 ) === $claimview.get( 
0 ) ) {
+   $claimview.data( 'movetoolbar' 
).$btnMoveUp.data( 'toolbarbutton' ).disable();
+   }
+
+   if( $bottomMostReferenceview.get( 0 ) === 
$claimview.get( 0 ) ) {
+   $claimview.data( 'movetoolbar' 
).$btnMoveDown.data( 'toolbarbutton' ).disable();
+   }
+   },
+   'claimviewafterstopediting statementviewafterstopediting': 
function( event ) {
+   // Destroy movetoolbar.
+
+   var $claimview = $( event.target ),
+   movetoolbar = $claimview.data( 'movetoolbar' );
+
+   if( movetoolbar ) {
+   // Toolbar might be destroyed already by 
cancelling a pending claimview.
+   movetoolbar.destroy();
+   }
+   },
+   'movetoolbarup movetoolbardown': function( event ) {
+   var $claimview = $( event.target ),
+   claimview = $claimview.data( 'claimview' ) || 
$claimview.data( 'statementview' );
+
+   if( !claimview ) {
+   // Not the event of the corresponding toolbar 
but of some other movetoolbar.
+   return;
+   }
+
+   var $claimlistview = $claimview.closest( 
':wikibase-claimlistview' ),
+   claimlistview = $claimlistview.data( 
'claimlistview' ),
+   claimlistviewListview = 
claimlistview.$listview.data( 'listview' ),
+   action = ( event.type === 'movetoolbarup' ) ? 
'moveUp' : 'moveDown',
+   claimviewIndex = claimlistviewListview.indexOf( 
$claimview ),
+   isLastListItem = ( claimviewIndex !== 
claimlistviewListview.items().length - 1 );
+
+   if( action === 'moveUp'  
claimlistviewListview.indexOf( $claimview ) !== 0 ) {
+   claimlistviewListview.moveUp( $claimview );
+   } else if( action === 'moveDown'  isLastListItem ) {
+   claimlistviewListview.moveDown( $claimview );
+   }
+
+   // Disable move up button if the claimview is the 
topmost in its claimlistview and/or
+   // move down button if it is the bottommost claimview:
+   var $btnMoveUp = $claimview.data( 'movetoolbar' 
).$btnMoveUp,
+   btnMoveUp = $btnMoveUp.data( 'toolbarbutton' ),
+   $btnMoveDown = $claimview.data( 'movetoolbar' 
).$btnMoveDown,
+   btnMoveDown 

[MediaWiki-commits] [Gerrit] Add OAuth identify method - change (mediawiki...OAuth)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add OAuth identify method
..


Add OAuth identify method

Allow OAuth Consumers to get a signed JWT about the user who authorized
the Consumer.

Change-Id: I86c0031a4a479994eb38aa7873ac665054d75d17
---
M OAuth.setup.php
M frontend/specialpages/SpecialMWOAuth.php
A lib/JWT.php
3 files changed, 275 insertions(+), 0 deletions(-)

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



diff --git a/OAuth.setup.php b/OAuth.setup.php
index 4db51a9..5333b15 100644
--- a/OAuth.setup.php
+++ b/OAuth.setup.php
@@ -76,6 +76,7 @@
$classes['OAuthServer'] = $libDir/OAuth.php;
$classes['OAuthDataStore'] = $libDir/OAuth.php;
$classes['OAuthUtil'] = $libDir/OAuth.php;
+   $classes['JWT'] = $libDir/JWT.php;
 
# Storage
$classes['MWOAuthDataStore'] = 
$backendDir/MWOAuthDataStore.php;
diff --git a/frontend/specialpages/SpecialMWOAuth.php 
b/frontend/specialpages/SpecialMWOAuth.php
index 78b1732..c1f9532 100644
--- a/frontend/specialpages/SpecialMWOAuth.php
+++ b/frontend/specialpages/SpecialMWOAuth.php
@@ -121,6 +121,31 @@
case 'grants':
$this-showGrantRightsTables();
break;
+   case 'identify':
+   $format = 'json'; // we only return 
JWT, so we assume json
+   $server = 
MWOAuthUtils::newMWOAuthServer();
+   $oauthRequest = 
MWOAuthRequest::fromRequest( $request );
+   // verify_request throws an exception 
if anything isn't verified
+   list( $consumer, $token ) = 
$server-verify_request( $oauthRequest );
+
+   $wiki = wfWikiID();
+   $dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
+   $access = 
MWOAuthConsumerAcceptance::newFromToken( $dbr, $token-key );
+   // Access token is for this wiki
+   if ( $access-get( 'wiki' ) !== '*'  
$access-get( 'wiki' ) !== $wiki ) {
+   throw new MWOAuthException(
+   
'mwoauth-invalid-authorization-wrong-wiki',
+   array( $wiki )
+   );
+   }
+   $localUser = 
MWOAuthUtils::getLocalUserFromCentralId( $access-get( 'userId' ) );
+   if ( !$localUser || 
!$localUser-isLoggedIn() ) {
+   throw new MWOAuthException( 
'mwoauth-invalid-authorization-invalid-user' );
+   }
+
+   // We know the identity of the user who 
granted the authorization
+   $this-outputJWT( $localUser, 
$consumer, $oauthRequest, $format );
+   break;
default:
$format = $request-getVal( 'format', 
'html' );
$dbr = MWOAuthUtils::getCentralDB( 
DB_SLAVE );
@@ -178,6 +203,47 @@
$this-getOutput()-addReturnTo( Title::newMainPage() );
}
 
+   /**
+* Make statements about the user, and sign the json with
+* a key shared with the Consumer.
+* @param User $user the user who is the subject of this request
+* @param OAuthConsumer $consumer
+*/
+   protected function outputJWT( $user, $consumer, $request, $format ) {
+   global $wgCanonicalServer;
+   $statement = array();
+
+   // Include some of the OpenID Connect attributes
+   // http://openid.net/specs/openid-connect-core-1_0.html (draft 
14)
+   // Issuer Identifier for the Issuer of the response.
+   $statement['iss'] = $wgCanonicalServer;
+   // Subject identifier. A locally unique and never reassigned 
identifier.
+   $statement['sub'] = MWOAuthUtils::getCentralIdFromLocalUser( 
$user );
+   // Audience(s) that this ID Token is intended for.
+   $statement['aud'] = $consumer-key;
+   // Expiration time on or after which the ID Token MUST NOT be 
accepted for processing.
+   $statement['exp'] = wfTimestamp() + 100;
+   // Time at which the JWT was issued.
+   $statement['iat'] = wfTimestamp();
+   

[MediaWiki-commits] [Gerrit] Remove module storage logging; replace with small clean-up s... - change (mediawiki...WikimediaEvents)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove module storage logging; replace with small clean-up 
script
..


Remove module storage logging; replace with small clean-up script

Mostly reverts I7e059e759, leaving behind a small script to clear the
experiment group assignment key from localStorage. Accompanies Id39d4457a,
which removes the experiment code from core.

Change-Id: I5d1f65e213dc9d0275151689a0b50d85eda1b5f7
---
M modules/ext.wikimediaEvents.moduleStorage.js
1 file changed, 6 insertions(+), 53 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.moduleStorage.js 
b/modules/ext.wikimediaEvents.moduleStorage.js
index a4eba50..f7d38fa 100644
--- a/modules/ext.wikimediaEvents.moduleStorage.js
+++ b/modules/ext.wikimediaEvents.moduleStorage.js
@@ -1,55 +1,8 @@
 /**
- * Log timing data for the ResourceLoader module storage performance 
evaluation.
- * @see https://meta.wikimedia.org/wiki/Schema:ModuleStorage
+ * Module storage experiment clean-up: purge 'moduleStorageExperiment' key from
+ * localStorage, set by MediaWiki in Id2835eca4. This module should be deleted
+ * after spending a couple of weeks in production.
  */
-( function ( mw, $ ) {
-
-   if (
-   // Return early
-   // ..if we're in debug mode.
-   mw.config.get( 'debug' ) ||
-   // ..if module storage is enabled by default.
-   mw.config.get( 'wgResourceLoaderStorageEnabled' ) ||
-   // ..if the experiment is not defined
-   mw.loader.store.experiment === undefined ||
-   // ..if the user is not included in the experiment.
-   ( mw.loader.store.experiment.group !== 1  
mw.loader.store.experiment.group !== 2 )
-   ) {
-   return;
-   }
-
-   $( window ).load( function () {
-   var store, moduleLoadingTime, event;
-
-   store = mw.loader.store;
-   moduleLoadingTime = ( new Date() ).getTime() - 
store.experiment.start;
-
-   event = {
-   experimentGroup: store.experiment.group,
-   experimentId: store.experiment.id.toString( 16 ),
-   moduleLoadingTime: moduleLoadingTime,
-   moduleStoreEnabled: !!store.enabled,
-   userAgent: navigator.userAgent,
-   loadedModulesCount: 0,
-   loadedModulesSize: 0
-   };
-
-   if ( mw.mobileFrontend  mw.config.exists( 'wgMFMode' ) ) {
-   event.mobileMode = mw.config.get( 'wgMFMode' );
-   }
-
-   $.each( mw.inspect.getLoadedModules(), function ( i, module ) {
-   event.loadedModulesCount++;
-   event.loadedModulesSize += mw.inspect.getModuleSize( 
module );
-   } );
-
-   if ( store.enabled ) {
-   event.moduleStoreExpired = store.stats.expired;
-   event.moduleStoreHits = store.stats.hits;
-   event.moduleStoreMisses = store.stats.misses;
-   }
-
-   mw.eventLog.logEvent( 'ModuleStorage', event );
-   } );
-
-}( mediaWiki, jQuery ) );
+try {
+   localStorage.removeItem( 'moduleStorageExperiment' );
+} catch ( e ) {}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d1f65e213dc9d0275151689a0b50d85eda1b5f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adjusted ChangeOpClaim/SetClaim to be able to reorder groups - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Adjusted ChangeOpClaim/SetClaim to be able to reorder groups
..


Adjusted ChangeOpClaim/SetClaim to be able to reorder groups

This enables moving groups of statements/claims according to their common main 
snak property.

Change-Id: I6579a1df79f7e612e5a574cc6065f31c76adea75
---
M repo/includes/ChangeOp/ChangeOpClaim.php
M repo/includes/api/SetClaim.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
3 files changed, 39 insertions(+), 45 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/ChangeOp/ChangeOpClaim.php 
b/repo/includes/ChangeOp/ChangeOpClaim.php
index acbf9ec..b59c6ee 100644
--- a/repo/includes/ChangeOp/ChangeOpClaim.php
+++ b/repo/includes/ChangeOp/ChangeOpClaim.php
@@ -3,6 +3,7 @@
 namespace Wikibase\ChangeOp;
 
 use InvalidArgumentException;
+use Wikibase\ByPropertyIdArray;
 use Wikibase\Claim;
 use Wikibase\Claims;
 use Wikibase\Entity;
@@ -89,54 +90,35 @@
$entityClaims = $entity-getClaims();
$claims = new Claims( $entityClaims );
 
-   $index = $this-index;
-
-   if( $index !== null ) {
-   $index = $this-getOverallClaimIndex( $entityClaims );
-   }
-
-   if( $claims-hasClaimWithGuid( $this-claim-getGuid() ) ){
-   if( is_null( $index ) ) {
-   // Set index to current index to not have the 
claim removed and appended but retain
-   // its position within the list of claims.
-   $index = $claims-indexOf( $this-claim );
-   }
-
-   $claims-removeClaimWithGuid( $this-claim-getGuid() );
-   $this-updateSummary( $summary, 'update' );
-   } else {
+   if( !$claims-hasClaimWithGuid( $this-claim-getGuid() ) ) {
+   // Adding a new claim.
$this-updateSummary( $summary, 'create' );
+
+   $indexedClaimList = new ByPropertyIdArray( 
$entityClaims );
+   $indexedClaimList-buildIndex();
+
+   $indexedClaimList-addObjectAtIndex( $this-claim, 
$this-index );
+
+   } else {
+   // Altering an existing claim.
+   $this-updateSummary( $summary, 'update' );
+
+   // Replace claim at its current index:
+   $currentIndex = $claims-indexOf( $this-claim );
+   $claims-removeClaimWithGuid( $this-claim-getGuid() );
+   $claims-addClaim( $this-claim, $currentIndex );
+
+   // Move claim to its designated index:
+   $indexedClaimList = new ByPropertyIdArray( $claims );
+   $indexedClaimList-buildIndex();
+
+   $index = !is_null( $this-index ) ? $this-index : 
$currentIndex;
+   $indexedClaimList-moveObjectToIndex( $this-claim, 
$index );
}
 
-   $claims-addClaim( $this-claim, $index );
+   $claims = new Claims( $indexedClaimList-toFlatArray() );
$entity-setClaims( $claims );
 
return true;
}
-
-   /**
-* Computes the claim's overall index within the list of claims from 
the index within the subset
-* of claims whose main snak features the same property id.
-* @since 0.5
-*
-* @param Claim[] $claims
-* @return int|null
-*/
-   protected function getOverallClaimIndex( $claims ) {
-   $overallIndex = 0;
-   $indexInProperty = 0;
-
-   foreach( $claims as $claim ) {
-   if( $claim-getPropertyId()-equals( 
$this-claim-getPropertyId() ) ) {
-   if( $indexInProperty++ === $this-index ) {
-   return $overallIndex;
-   }
-   }
-   $overallIndex++;
-   }
-
-   // No claims with the same main snak property exist.
-   return $this-index;
-   }
-
 }
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 551d236..84647ba 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -162,7 +162,7 @@
parent::getParamDescription(),
array(
'claim' = 'Claim serialization',
-   'index' = 'The index within the entity\'s list 
of claims/statements featuring the same main snak property where to move the 
claim/statement to. Optional. When not provided, an existing 

[MediaWiki-commits] [Gerrit] Implemented ordering of statement groups in the UI - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Implemented ordering of statement groups in the UI
..


Implemented ordering of statement groups in the UI

Introducing the claimlistview option firstClaimIndex and moved the toolbar 
definition to
move statements to the claimgrouplistview widget as functionality to move claim 
groups is
added to the toolbar definition.

Change-Id: I9ca4ea979bdab4a632acded1106a0293a10d6d4a
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
3 files changed, 151 insertions(+), 92 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index 0f8ab80..4fd75e6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -146,6 +146,18 @@
_createClaimGroupListview: function() {
var self = this;
 
+   function indexOf( claimsSubset, claims ) {
+   if(
+   !$.isArray( claimsSubset ) || 
!claimsSubset.length
+   || !$.isArray( claims ) || !claims.length
+   ) {
+   return null;
+   }
+
+   var index = $.inArray( claimsSubset[0], claims );
+   return ( index !== -1 ) ? index : null;
+   }
+
this.$listview.listview( {
listItemAdapter: new 
$.wikibase.listview.ListItemAdapter( {
listItemWidget: $.wikibase.claimlistview,
@@ -153,7 +165,8 @@
newItemOptionsFn: function( value ) {
return {
value: value,
-   entityType: self.option( 
'entityType' )
+   entityType: self.option( 
'entityType' ),
+   firstClaimIndex: indexOf( 
value, self.option( 'value' ) )
};
}
} )
@@ -334,4 +347,128 @@
}
 } );
 
+// TODO: The following toolbar manages claimviews/statementviews as well as 
claimgrouplistviews.
+//   There should be separate toolbars for managing the content of these two 
widgets.
+$.wikibase.toolbarcontroller.definition( 'movetoolbar', {
+   id: 'claimlistview-claimview',
+   selector: '.wb-claimview',
+   events: {
+   'claimviewstartediting statementviewstartediting': function( 
event ) {
+   // Initialize movetoolbar.
+
+   var $claimview = $( event.target ),
+   $claimlistview = $claimview.closest( 
':wikibase-claimlistview' ),
+   claimlistview = $claimlistview.data( 
'claimlistview' ),
+   claimlistviewListview = 
claimlistview.$listview.data( 'listview' ),
+   $claimviews = claimlistviewListview.items(),
+   $claimgrouplistview = $claimlistview.closest( 
':wikibase-claimgrouplistview' ),
+   claimgrouplistview = $claimgrouplistview.data( 
'claimgrouplistview' ),
+   claimgrouplistviewListview = 
claimgrouplistview.$listview.data( 'listview' ),
+   $claimlistviews = 
claimgrouplistviewListview.items();
+
+   $claimview.movetoolbar();
+
+   // If the claimview is the topmost claimview in the 
topmost claimgroup, the move up
+   // button needs to be disabled; Same for the move 
down button if the claimview is
+   // the bottommost claimview in the bottommost 
claimgroup.
+   var isInTopmostClaimgroup = 
$claimlistviews.first().get( 0 ) === $claimlistview.get( 0 ),
+   isTopmostInClaimlistview = 
$claimviews.first().get( 0 ) === $claimview.get( 0 ),
+   isInBottommostClaimgroup = 
$claimlistviews.last().get( 0 ) === $claimlistview.get( 0 ),
+   isBottommostInClaimlistview = 
$claimviews.last().get( 0 ) === $claimview.get( 0 );
+
+   if ( isInTopmostClaimgroup  isTopmostInClaimlistview 
) {
+   $claimview.data( 'movetoolbar' 
).$btnMoveUp.data( 'toolbarbutton' ).disable();
+   }
+

[MediaWiki-commits] [Gerrit] Fix spacing for NewWikiPageNavigationEvent - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has submitted this change and it was merged.

Change subject: Fix spacing for NewWikiPageNavigationEvent
..


Fix spacing for NewWikiPageNavigationEvent

Change-Id: Iaf80754a1e78f4ec9973062b3f152574f4cc02ab
---
M 
wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
index 042e0fc..ae25589 100644
--- 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
+++ 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/events/NewWikiPageNavigationEvent.java
@@ -3,13 +3,13 @@
 import org.wikimedia.wikipedia.PageTitle;
 
 public class NewWikiPageNavigationEvent {
-private final PageTitle title;
+private final PageTitle title;
 
-public NewWikiPageNavigationEvent(PageTitle title) {
-this.title = title;
-}
+public NewWikiPageNavigationEvent(PageTitle title) {
+this.title = title;
+}
 
-public PageTitle getTitle() {
-return title;
-}
+public PageTitle getTitle() {
+return title;
+}
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf80754a1e78f4ec9973062b3f152574f4cc02ab
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Using explicit checks in wb.Statement - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Using explicit checks in wb.Statement
..


Using explicit checks in wb.Statement

Change-Id: Ief51349de5b8d7e337ebc5fc9fcc2ee7c1aa9fa6
---
M lib/resources/wikibase.datamodel/wikibase.Statement.js
M lib/tests/qunit/wikibase.datamodel/wikibase.Statement.tests.js
2 files changed, 56 insertions(+), 5 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/wikibase.datamodel/wikibase.Statement.js 
b/lib/resources/wikibase.datamodel/wikibase.Statement.js
index fa0ee70..429761d 100644
--- a/lib/resources/wikibase.datamodel/wikibase.Statement.js
+++ b/lib/resources/wikibase.datamodel/wikibase.Statement.js
@@ -1,6 +1,4 @@
 /**
- * @file
- * @ingroup WikibaseLib
  * @licence GNU GPL v2+
  * @author Daniel Werner
  */
@@ -11,7 +9,7 @@
constructor = function( mainSnak, qualifiers, references, rank, guid ) {
PARENT.call( this, mainSnak, qualifiers, guid );
this.setReferences( references || [] );
-   this.setRank( !rank ? wb.Statement.RANK.NORMAL : rank );
+   this.setRank( rank === undefined ? wb.Statement.RANK.NORMAL : 
rank );
};
 
 /**
@@ -141,8 +139,8 @@
} );
}
 
-   if ( this._rank ) {
-   $.each( SELF.RANK, function ( rank, i ) {
+   if ( this._rank !== undefined ) {
+   $.each( SELF.RANK, function( rank, i ) {
if ( self._rank === i ) {
json.rank = rank.toLowerCase();
return false;
diff --git a/lib/tests/qunit/wikibase.datamodel/wikibase.Statement.tests.js 
b/lib/tests/qunit/wikibase.datamodel/wikibase.Statement.tests.js
index 600e9ee..5d4b495 100644
--- a/lib/tests/qunit/wikibase.datamodel/wikibase.Statement.tests.js
+++ b/lib/tests/qunit/wikibase.datamodel/wikibase.Statement.tests.js
@@ -8,6 +8,59 @@
 
QUnit.module( 'wikibase.datamodel.Statement', QUnit.newWbEnvironment() 
);
 
+   QUnit.test( 'Rank evaluation on instantiation', function( assert ) {
+   var statement = new wb.Statement(
+   new wb.PropertyValueSnak( 'P1', new dv.StringValue( 
'string1' ) )
+   );
+
+   assert.equal(
+   statement.getRank(),
+   wb.Statement.RANK.NORMAL,
+   'Assigning \'normal\' rank by default.'
+   );
+
+   statement = new wb.Statement(
+   new wb.PropertyValueSnak( 'P1', new dv.StringValue( 
'string1' ) ),
+   null,
+   null,
+   wb.Statement.RANK.DEPRECATED
+   );
+
+   assert.equal(
+   statement.getRank(),
+   wb.Statement.RANK.DEPRECATED,
+   'Instantiated statement object with \'deprecated\' 
rank.'
+   );
+   } );
+
+   QUnit.test( 'setRank()  getRank()', function( assert ) {
+   var statement = new wb.Statement( new wb.PropertyNoValueSnak( 
'P1' ) );
+
+   statement.setRank( wb.Statement.RANK.PREFERRED );
+
+   assert.equal(
+   statement.getRank(),
+   wb.Statement.RANK.PREFERRED,
+   'Assigned \'preferred\' rank.'
+   );
+
+   statement.setRank( wb.Statement.RANK.DEPRECATED );
+
+   assert.equal(
+   statement.getRank(),
+   wb.Statement.RANK.DEPRECATED,
+   'Assigned \'deprecated\' rank.'
+   );
+
+   statement.setRank( wb.Statement.RANK.NORMAL );
+
+   assert.equal(
+   statement.getRank(),
+   wb.Statement.RANK.NORMAL,
+   'Assigned \'normal\' rank.'
+   );
+   } );
+
QUnit.test( 'toJSON', function( assert ) {
var statement = new wb.Statement( new wb.PropertyNoValueSnak( 
'P42' ) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief51349de5b8d7e337ebc5fc9fcc2ee7c1aa9fa6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Implemented rank selector widget - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Implemented rank selector widget
..


Implemented rank selector widget

The rank selector displays the rank and allows changing the rank of each 
statement.

Change-Id: I7caadcd0189bc492c7f55766186231299fb833b1
---
M lib/WikibaseLib.hooks.php
M lib/resources/Resources.php
A lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
A lib/resources/jquery.wikibase/themes/default/images/rankselector.png
A 
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css
M lib/resources/templates.php
M lib/resources/wikibase.css
A 
lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.RankSelector.tests.js
M repo/Wikibase.i18n.php
M repo/includes/ClaimHtmlGenerator.php
M repo/includes/EntityView.php
12 files changed, 625 insertions(+), 17 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index ae5b10f..0111ded 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -11,11 +11,10 @@
  *
  * @since 0.1
  *
- * @file
- * @ingroup WikibaseLib
- *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw  jeroended...@gmail.com 
+ * @author Daniel Werner  daniel.a.r.wer...@gmail.com 
+ * @author H. Snater  mediaw...@snater.com 
  */
 final class LibHooks {
 
@@ -171,7 +170,16 @@
),
);
 
-   $testModules['qunit']['jquery.wikibase.snaklistview.tests'] = 
$moduleBase +  array(
+   $testModules['qunit']['jquery.wikibase.statementview.tests'] = 
$moduleBase + array(
+   'scripts' = array(
+   
'tests/qunit/jquery.wikibase/jquery.wikibase.statementview.RankSelector.tests.js',
+   ),
+   'dependencies' = array(
+   'jquery.wikibase.statementview',
+   ),
+   );
+
+   $testModules['qunit']['jquery.wikibase.snaklistview.tests'] = 
$moduleBase + array(
'scripts' = array(

'tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js',
),
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 11b2c3b..d46a3bb 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -8,11 +8,9 @@
  *
  * @since 0.2
  *
- * @file
- * @ingroup WikibaseLib
- *
  * @licence GNU GPL v2+
  * @author Daniel Werner
+ * @author H. Snater  mediaw...@snater.com 
  *
  * @codeCoverageIgnoreStart
  */
@@ -551,6 +549,7 @@
'wikibase.AbstractedRepoApi',
'wikibase.store', // required for getting 
datatype from entityselector selected property
'mediawiki.legacy.shared',
+   'jquery.ui.position',
'jquery.ui.TemplatedWidget',
// valueviews for representing DataValues in 
snakview:
'jquery.valueview.experts.stringvalue',
@@ -605,17 +604,26 @@
'jquery.wikibase.statementview' = $moduleTemplate + array(
'scripts' = array(

'jquery.wikibase/jquery.wikibase.statementview.js',
+   
'jquery.wikibase/jquery.wikibase.statementview.RankSelector.js',
+   ),
+   'styles' = array(
+   
'jquery.wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css',
),
'dependencies' = array(
+   'jquery.ui.position',
+   'jquery.ui.toggler',
'jquery.wikibase.claimview',
'jquery.wikibase.listview',
'jquery.wikibase.referenceview',
'jquery.wikibase.toolbarcontroller',
'wikibase.AbstractedRepoApi',
+   'wikibase.datamodel',
'wikibase.utilities',
-   'jquery.ui.toggler',
),
'messages' = array(
+   
'wikibase-statementview-rankselector-rank-preferred',
+   
'wikibase-statementview-rankselector-rank-normal',
+   
'wikibase-statementview-rankselector-rank-deprecated',

[MediaWiki-commits] [Gerrit] Added SetReference test with invalid property - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Added SetReference test with invalid property
..


Added SetReference test with invalid property

(bug 55901)
Validation of reference snaks has been fixed. This change sets adds a test 
regarding invalid
property usage.

Change-Id: Iedfde729e8cecd4258f4cd1948fcd0db6a5fabc8
---
M repo/includes/api/SetReference.php
M repo/tests/phpunit/includes/api/SetReferenceTest.php
2 files changed, 54 insertions(+), 21 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/api/SetReference.php 
b/repo/includes/api/SetReference.php
index ffda27f..ad1822e 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -154,13 +154,15 @@
} catch( InvalidArgumentException $invalidArgumentException ) {
// Handle Snak instantiation failures
$this-dieUsage(
-   'Failed to get reference from reference 
Serialization ' . $invalidArgumentException-getMessage(),
-   'invalid-json'
+   'Failed to get reference from reference 
Serialization '
+   . 
$invalidArgumentException-getMessage(),
+   'snak-instantiation-failure'
);
} catch( OutOfBoundsException $outOfBoundsException ) {
$this-dieUsage(
-   'Failed to get reference from reference 
Serialization ' . $outOfBoundsException-getMessage(),
-   'invalid-json'
+   'Failed to get reference from reference 
Serialization '
+   . $outOfBoundsException-getMessage(),
+   'snak-instantiation-failure'
);
}
 
diff --git a/repo/tests/phpunit/includes/api/SetReferenceTest.php 
b/repo/tests/phpunit/includes/api/SetReferenceTest.php
index 900874b..928d99e 100644
--- a/repo/tests/phpunit/includes/api/SetReferenceTest.php
+++ b/repo/tests/phpunit/includes/api/SetReferenceTest.php
@@ -42,25 +42,28 @@
public function setUp() {
static $hasProperties = false;
if ( !$hasProperties ) {
-   $prop = PropertyContent::newEmpty();
-   $prop-getEntity()-setId( new PropertyId( 'P42' ) );
-   $prop-getEntity()-setDataTypeId( 'string' );
-   $prop-save( 'testing' );
-
-   $prop = PropertyContent::newEmpty();
-   $prop-getEntity()-setId( new PropertyId( 'P43' ) );
-   $prop-getEntity()-setDataTypeId( 'string' );
-   $prop-save( 'testing' );
-
-   $prop = PropertyContent::newEmpty();
-   $prop-getEntity()-setId( new PropertyId( 'P66' ) );
-   $prop-getEntity()-setDataTypeId( 'string' );
-   $prop-save( 'testing' );
+   $this-createProperty( 1 );
+   $this-createProperty( 2 );
+   $this-createProperty( 3 );
+   $this-createProperty( 42 );
+   $this-createProperty( 43 );
+   $this-createProperty( 66 );
 
$hasProperties = true;
}
 
parent::setUp();
+   }
+
+   /**
+* @param int $id
+* @param string $dataTypeId
+*/
+   public function createProperty( $id, $dataTypeId = 'string' ) {
+   $prop = PropertyContent::newEmpty();
+   $prop-getEntity()-setId( $id );
+   $prop-getEntity()-setDataTypeId( $dataTypeId );
+   $prop-save( 'testing' );
}
 
// TODO: clean this up so more of the input space can easily be tested
@@ -133,6 +136,26 @@
);
}
 
+   public function testRequestWithInvalidProperty() {
+   $item = Item::newEmpty();
+   $content = new ItemContent( $item );
+   $content-save( '', null, EDIT_NEW );
+
+   // Create a statement to act upon:
+   $statement = $item-newClaim( new PropertyNoValueSnak( 42 ) );
+   $statement-setGuid(
+   $item-getId()-getPrefixedId() . 
'$D8505CDA-25E4-4334-AG93-A3290BCD9C0P'
+   );
+
+   $item-addClaim( $statement );
+
+   $content-save( '' );
+
+   $reference = new Reference( new SnakList( array( new 
PropertySomeValueSnak(  ) ) ) );
+
+   $this-makeInvalidRequest( $statement-getGuid(), null, 
$reference, 'invalid-snak-value' );
+   }
+
public function 

[MediaWiki-commits] [Gerrit] Load page module when the navigation is displayed - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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


Change subject: Load page module when the navigation is displayed
..

Load page module when the navigation is displayed

Change-Id: I53a7f19e1d74f74f097c358a7038ad863f97b278
---
M ProofreadPage.body.php
M ProofreadPage.php
R modules/page/ext.proofreadpage.page.navigation.js
R modules/page/ext.proofreadpage.page.navigation.vector.css
4 files changed, 17 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/24/97924/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 9089369..206eebe 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -184,21 +184,21 @@
 * @param $out OutputPage
 * @return bool
 */
-   public static function onBeforePageDisplay( $out ) {
+   public static function onBeforePageDisplay( OutputPage $out ) {
$action = $out-getRequest()-getVal( 'action' );
-   $isEdit = ( $action == 'submit' || $action == 'edit' );
-
-   if ( ( !$out-isArticle()  !$isEdit ) || isset( 
$out-proofreadPageDone ) ) {
-   return true;
-   }
-   $out-proofreadPageDone = true;
+   $isEdit = ( $action === 'submit' || $action === 'edit' );
$title = $out-getTitle();
 
if ( $title-inNamespace( self::getIndexNamespaceId() ) ) {
-   if( !$isEdit ) {
-   $out-addModuleStyles( 'ext.proofreadpage.base' 
);
-   }
-   } elseif ( $title-inNamespace( NS_MAIN ) ) {
+   $out-addModuleStyles( 'ext.proofreadpage.base' );
+   } elseif ( $title-inNamespace( self::getPageNamespaceId() ) ) {
+   $out-addModules( 'ext.proofreadpage.page.navigation' );
+   } elseif (
+   $title-inNamespace( NS_MAIN ) 
+   ( $out-isArticle() || $isEdit ) 
+   !isset( $out-proofreadPageDone )
+   ) {
+   $out-proofreadPageDone = true;
self::prepareArticle( $out );
}
 
diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..a4fb194 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -118,10 +118,6 @@
),
'ext.proofreadpage.page' = $prpResourceTemplate + array(
'styles'  = 'page/ext.proofreadpage.page.css',
-   'scripts' = 'page/ext.proofreadpage.page.js',
-   'skinStyles' = array(
-   'vector' = 'page/ext.proofreadpage.page.vector.css',
-   ),
'dependencies' = array( 'ext.proofreadpage.base' )
),
'ext.proofreadpage.page.edit' = $prpResourceTemplate + array(
@@ -145,6 +141,12 @@
'proofreadpage-preferences-showheaders-label',
)
),
+   'ext.proofreadpage.page.navigation' = $prpResourceTemplate + array(
+   'scripts' = 'page/ext.proofreadpage.page.navigation.js',
+   'skinStyles' = array(
+   'vector' = 
'page/ext.proofreadpage.page.navigation.vector.css',
+   )
+   ),
'ext.proofreadpage.article' = $prpResourceTemplate + array(
'scripts' = 'article/ext.proofreadpage.article.js',
'dependencies' = array( 'ext.proofreadpage.base' )
diff --git a/modules/page/ext.proofreadpage.page.js 
b/modules/page/ext.proofreadpage.page.navigation.js
similarity index 100%
rename from modules/page/ext.proofreadpage.page.js
rename to modules/page/ext.proofreadpage.page.navigation.js
diff --git a/modules/page/ext.proofreadpage.page.vector.css 
b/modules/page/ext.proofreadpage.page.navigation.vector.css
similarity index 100%
rename from modules/page/ext.proofreadpage.page.vector.css
rename to modules/page/ext.proofreadpage.page.navigation.vector.css

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53a7f19e1d74f74f097c358a7038ad863f97b278
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr

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

[MediaWiki-commits] [Gerrit] Removed 'Disable browser page caching user preference - change (mediawiki/core)

[01tonythomas (Code Review)]

01tonythomas has uploaded a new change for review.

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


Change subject: Removed 'Disable browser page caching user preference
..

Removed 'Disable browser page caching user preference

It is  a very advanced user preference with little usage and is often 
misleading.

Bug: 52809
Change-Id: I2150c2293a03df80e5ab0b2014e4930120ff5761
---
M includes/AjaxResponse.php
M includes/DefaultSettings.php
M includes/OutputPage.php
M includes/Preferences.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
6 files changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/25/97925/1

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index d553652..037ef9a 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -224,11 +224,6 @@
return false;
}
 
-   if ( $wgUser-getOption( 'nocache' ) ) {
-   wfDebug( $fname: USER DISABLED CACHE\n, false );
-   return false;
-   }
-
$timestamp = wfTimestamp( TS_MW, $timestamp );
$lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, 
$wgUser-getTouched(), $wgCacheEpoch ) );
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2d1ddcb..b10ae45 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3988,7 +3988,6 @@
'math' = 1,
'minordefault' = 0,
'newpageshidepatrolled' = 0,
-   'nocache' = 0,
'noconvertlink' = 0,
'norollbackdiff' = 0,
'numberheadings' = 0,
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b4fda13..879faca 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -687,10 +687,6 @@
wfDebug( __METHOD__ . : CACHE DISABLED\n, false );
return false;
}
-   if ( $this-getUser()-getOption( 'nocache' ) ) {
-   wfDebug( __METHOD__ . : USER DISABLED CACHE\n, false 
);
-   return false;
-   }
 
$timestamp = wfTimestamp( TS_MW, $timestamp );
$modifiedTimes = array(
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c9caf4f..f92413a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -756,11 +756,6 @@
'label-message' = 'tog-showtoc',
);
}
-   $defaultPreferences['nocache'] = array(
-   'type' = 'toggle',
-   'label-message' = 'tog-nocache',
-   'section' = 'rendering/advancedrendering',
-   );
$defaultPreferences['showhiddencats'] = array(
'type' = 'toggle',
'section' = 'rendering/advancedrendering',
diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 2baccf5..7988fd4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -676,7 +676,6 @@
 'tog-minordefault'= 'Mark all edits minor by default',
 'tog-previewontop'= 'Show preview before edit box',
 'tog-previewonfirst'  = 'Show preview on first edit',
-'tog-nocache' = 'Disable browser page caching',
 'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist 
is changed',
 'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',
 'tog-enotifminoredits'= 'Email me also for minor edits of pages and 
files',
diff --git a/maintenance/language/messages.inc 
b/maintenance/language/messages.inc
index 17658a0..98f3632 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -48,7 +48,6 @@
'tog-minordefault',
'tog-previewontop',
'tog-previewonfirst',
-   'tog-nocache',
'tog-enotifwatchlistpages',
'tog-enotifusertalkpages',
'tog-enotifminoredits',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2150c2293a03df80e5ab0b2014e4930120ff5761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com

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

[MediaWiki-commits] [Gerrit] API: Add $wgAPIFormatModules - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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


Change subject: API: Add $wgAPIFormatModules
..

API: Add $wgAPIFormatModules

The API currently allows for adding action modules with
$wgAPIModules and query modules with various other $wgAPI*Modules
variables. But there's no way to add a formatting module from an
extension. For parallelism, let's add $wgAPIFormatModules to do just
that.

Bug: 57637
Change-Id: Ia0bd253104a4b5bc56d4fe0dc6736e2129b126f3
---
M includes/DefaultSettings.php
M includes/api/ApiMain.php
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/97926/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 951dc21..e23aea4 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6539,6 +6539,7 @@
  * @todo Describe each of the variables, group them and add examples
  */
 $wgAPIModules = array();
+$wgAPIFormatModules = array();
 $wgAPIMetaModules = array();
 $wgAPIPropModules = array();
 $wgAPIListModules = array();
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index a9aebe9..861fa82 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -185,11 +185,12 @@
}
}
 
-   global $wgAPIModules;
+   global $wgAPIModules, $wgAPIFormatModules;
$this-mModuleMgr = new ApiModuleManager( $this );
$this-mModuleMgr-addModules( self::$Modules, 'action' );
$this-mModuleMgr-addModules( $wgAPIModules, 'action' );
$this-mModuleMgr-addModules( self::$Formats, 'format' );
+   $this-mModuleMgr-addModules( $wgAPIFormatModules, 'format' );
 
$this-mResult = new ApiResult( $this );
$this-mEnableWrite = $enableWrite;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0bd253104a4b5bc56d4fe0dc6736e2129b126f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Created an AccumChain obj to use in AsyncTTM transformTokens... - change (mediawiki...Parsoid)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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


Change subject: Created an AccumChain obj to use in AsyncTTM transformTokens 
loop.
..

Created an AccumChain obj to use in AsyncTTM transformTokens loop.

* Used to be a var with a bunch of properties and functions
  that was treated like a singleton, but constructed each
  time through the transformTokens loop.

* Not sure if this is better/faster.  To be tested.

* No change in parser tests results.

Change-Id: I07ea407bea9850f0818169eb622d21ec6ceb60fa
---
M js/lib/mediawiki.TokenTransformManager.js
1 file changed, 68 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/27/97927/1

diff --git a/js/lib/mediawiki.TokenTransformManager.js 
b/js/lib/mediawiki.TokenTransformManager.js
index 1003e2c..b1f5bca 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -443,6 +443,72 @@
 // all instances of the Async TTM.
 AsyncTokenTransformManager.prototype._counter = 0;
 
+function AccumChain(ttm, parentCB) {
+   this.ttm = ttm;
+   this.firstAccum = null;
+   this.accum = null;
+   this.next = null;
+   this.maybeAsyncCB = null;
+   this.numNodes = 0;
+   this.debugId = 0;
+
+   // Shared accum-chain state accessible to synchronous transforms in 
maybeSyncReturn
+   this.state = {
+   // Indicates we are still in the transformTokens loop
+   transforming: true,
+   // debug id for this expansion
+   c: 'c-' + AsyncTokenTransformManager.prototype._counter++
+   };
+
+   this.init(parentCB);
+}
+
+AccumChain.prototype = {
+   makeNextAccum: function(cb) {
+   var cbs = { };
+   var maybeAsyncCB = this.ttm.maybeSyncReturn.bind( this.ttm, 
this.state, cbs );
+
+   // The new accumulator is never used unless we hit async mode.
+   // Even though maybeAsyncCB references newAccum via 
cbs.parentCB,
+   // that code path is exercised only when async mode is entered,
+   // so we are all good on that front.
+   var newAccum = new TokenAccumulator( this.ttm, cb );
+   // 'newAccum' will receive tokens from a child pipeline/cb
+   cbs.parentCB = newAccum.receiveToksFromChild.bind(newAccum);
+   cbs.self = maybeAsyncCB;
+
+   return { accum: newAccum, cb: maybeAsyncCB };
+   },
+   init: function(parentCB) {
+   // Local accum for synchronously returned fully processed tokens
+   // Make localAccum compatible with receiveToksFromSibling
+   var localAccum = [];
+   localAccum.receiveToksFromSibling = function() { return 
parentCB; };
+
+   this.firstAccum = localAccum;
+   this.accum = localAccum;
+   var nextAccumAndCB = this.makeNextAccum( parentCB );
+   this.next = nextAccumAndCB.accum;
+   this.maybeAsyncCB = nextAccumAndCB.cb;
+   this.numNodes = 1;
+   },
+   initRes: function() {
+   this.state.res = {};
+   },
+   addNode: function() {
+   // console.warn(-- ATT- + this.ttm.uid +  new link in 
chain);
+   this.accum = this.next;
+   // 'accum' will receive toks from the 'next' node that will be 
created
+   var nextAccumAndCB = this.makeNextAccum( 
this.accum.receiveToksFromSibling.bind(this.accum) );
+   this.next = nextAccumAndCB.accum;
+   this.maybeAsyncCB = nextAccumAndCB.cb;
+   this.numNodes++;
+   },
+   push: function(tok) {
+   this.accum.push(tok);
+   }
+};
+
 /**
  * Run asynchronous transformations. This is the big workhorse where
  * templates, images, links and other async expansions (see the transform
@@ -464,69 +530,8 @@
 
//console.warn('AsyncTokenTransformManager.transformTokens: ' + 
JSON.stringify(tokens) );
 
-   var accumChain = {
-   ttm: null,
-   firstAccum: null,
-   accum: null,
-   next: null,
-   maybeAsyncCB: null,
-   numNodes: 0,
-   debugId: 0,
-   // Shared accum-chain state accessible to synchronous 
transforms in maybeSyncReturn
-   state: {
-   // Indicates we are still in the transformTokens loop
-   transforming: true,
-   // debug id for this expansion
-   c: 'c-' + 
AsyncTokenTransformManager.prototype._counter++
-   },
-   makeNextAccum: function(cb) {
-   var cbs = { };
-   var maybeAsyncCB = this.ttm.maybeSyncReturn.bind( 
this.ttm, this.state, cbs 

[MediaWiki-commits] [Gerrit] (bug 57646) Exclude missing entities from JS vars - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: (bug 57646) Exclude missing entities from JS vars
..


(bug 57646) Exclude missing entities from JS vars

Referenced items that have been deleted should not be
present in the wbUsedEntities JS variable used by EntityView.

Change-Id: I77af42488b4258ab9eb42682ac10123dd4a1d9ff
---
M lib/includes/store/EntityInfoBuilder.php
M lib/includes/store/sql/SqlEntityInfoBuilder.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
M repo/includes/EntityView.php
M repo/tests/phpunit/includes/EntityViewTest.php
7 files changed, 235 insertions(+), 16 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/store/EntityInfoBuilder.php 
b/lib/includes/store/EntityInfoBuilder.php
index f084c9b..a73ee9f 100644
--- a/lib/includes/store/EntityInfoBuilder.php
+++ b/lib/includes/store/EntityInfoBuilder.php
@@ -42,4 +42,12 @@
 *with the key being the entity's ID. NOTE: This array will be 
updated!
 */
public function addDataTypes( array $entityInfo );
+
+   /**
+* Removes entries for non-existent Entities from $entityInfo.
+*
+* @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
+*with the key being the entity's ID. NOTE: This array will be 
updated!
+*/
+   public function removeMissing( array $entityInfo );
 }
diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php 
b/lib/includes/store/sql/SqlEntityInfoBuilder.php
index b0996b4..f15d0b1 100644
--- a/lib/includes/store/sql/SqlEntityInfoBuilder.php
+++ b/lib/includes/store/sql/SqlEntityInfoBuilder.php
@@ -39,6 +39,11 @@
protected $propertyInfoTable;
 
/**
+* @var string
+*/
+   protected $entityPerPageTable;
+
+   /**
 * @var EntityIdParser
 */
protected $idParser;
@@ -61,6 +66,7 @@
 
$this-termTable = 'wb_terms';
$this-propertyInfoTable = 'wb_property_info';
+   $this-entityPerPageTable = 'wb_entity_per_page';
}
 
/**
@@ -101,7 +107,7 @@
/* @var EntityId $id */
$id = $this-idParser-parse( $prefixedId );
$type = $id-getEntityType();
-   $ids[$type][] = $id-getNumericId();
+   $ids[$type][$prefixedId] = $id-getNumericId();
}
 
return $ids;
@@ -135,9 +141,7 @@
}
 
/**
-* Adds terms (like labels and/or descriptions and/or aliases) to the 
entity records in
-* $entityInfo. If no such terms are found for an entity, the 
respective field in the
-* entity records is set to array().
+* @see EntityInfoBuilder::addTerms()
 *
 * @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
 *with the key being the entity's ID. NOTE: This array will be 
updated!
@@ -271,8 +275,7 @@
}
 
/**
-* Adds property data types to the entries in $entityInfo. Missing 
Properties
-* will have their datatype field set to null. Other entities remain 
unchanged.
+* @see EntityInfoBuilder::addDataTypes()
 *
 * @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
 *with the key being the entity's ID. NOTE: This array will be 
updated!
@@ -330,4 +333,69 @@
$entityInfo[$key]['datatype'] = $row-pi_type;
}
}
+
+   /**
+* Adds property data types to the entries in $entityInfo. Missing 
Properties
+* will have their datatype field set to null. Other entities remain 
unchanged.
+*
+* @param array $entityInfo a map of strings to arrays, each array 
representing an entity,
+*with the key being the entity's ID. NOTE: This array will be 
updated!
+*/
+   public function removeMissing( array $entityInfo ) {
+   wfProfileIn( __METHOD__ );
+
+   $entityIdsByType = $this-getNumericEntityIds( $entityInfo );
+
+   //NOTE: we make one DB query per entity type, so we can take 
advantage of the
+   //  database index on the epp_entity_type field.
+   foreach ( $entityIdsByType as $type = $idsForType ) {
+   $pageIds = $this-getPageIdsForEntities( $type, 
$idsForType );
+   $missingNumericIds = array_diff( $idsForType, 
array_keys( $pageIds ) );
+
+   // get the missing prefixed ids based on the missing 
numeric ids
+   $numericToPrefixed = array_flip( $idsForType );
+ 

[MediaWiki-commits] [Gerrit] Bug 56282: Enable gzip compression support, the sequel - change (mediawiki...Parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Bug 56282: Enable gzip compression support, the sequel
..


Bug 56282: Enable gzip compression support, the sequel

Varnish will

* always send 'Accept-Encoding: gzip' to the backend
* ignore a returned 'Vary: Accept-Encoding' header
* transparently decompressed stored gzipped content

Verified working using the varnish setup in betalabs.

The Parsoid version in betalabs is also old enough to still send
the cookie header unconditionally in requests back to varnish, and
thus exhibits the same cache misses we saw in the last deployment.
I manually tested with varying accept headers, but without the 
cookie header.

Change-Id: If94b65564ab7264969636559f9c79efc114ccfc1
---
M js/api/ParserService.js
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index 129ac98..2e7d5a6 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -372,6 +372,9 @@
 // Increase the form field size limit from the 2M default.
 app.use(express.bodyParser({maxFieldsSize: 15 * 1024 * 1024}));
 
+// Support gzip / deflate transfer-encoding
+app.use(express.compress());
+
 app.get('/', function(req, res){
res.write('htmlbody\n');
res.write('h3Welcome to the a 
href=https://www.mediawiki.org/wiki/Parsoid;Parsoid/a web service./h3\n');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If94b65564ab7264969636559f9c79efc114ccfc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Alphabetically sorted project list - change (analytics/wikimetrics)

[Milimetric (Code Review)]

Milimetric has submitted this change and it was merged.

Change subject: Alphabetically sorted project list
..


Alphabetically sorted project list

Default Project field in upload cohorts now displays autocomplete for projects 
alphabetically.

Change-Id: Ia6f203cb61af053f7995da9ca8e93275eb3d6c4d
---
M wikimetrics/controllers/cohorts.py
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Milimetric: Verified; Looks good to me, approved



diff --git a/wikimetrics/controllers/cohorts.py 
b/wikimetrics/controllers/cohorts.py
index 5e3f89f..4addb40 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -169,14 +169,13 @@
 url_for('cohorts_index'),
 vc.cohort_id
 ))
-
 except Exception, e:
 app.logger.exception(str(e))
 flash('Server error while processing your upload', 'error')
 
 return render_template(
 'csv_upload.html',
-projects=json.dumps(db.project_host_map.keys()),
+projects=json.dumps(sorted(db.project_host_map.keys())),
 form=form,
 )
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6f203cb61af053f7995da9ca8e93275eb3d6c4d
Gerrit-PatchSet: 2
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Terrrydactyl tcho...@gmail.com
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fixed buggy generation/application of changetrees to simulat... - change (mediawiki...Parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fixed buggy generation/application of changetrees to simulate 
edits
..


Fixed buggy generation/application of changetrees to simulate edits

* The change-tree application code had a glaring bug where changes
  wouldn't be made to a node if it was not an element node. This
  was a leftover from earlier versions of the code which wasn't
  removed during updates to the edit simulation code.

  So, a lot of change trees with 2/3/4 set on comment/text
  nodes were never being applied so far which effectively stunted
  our selser testing strategy by reducing the # of unique randomized
  tests.

* Regenerated blacklist. Looks like more tests are passing now. Most
  of the blacklist changes seems to be shuffling around of output on
  failing selser tests.

 BEFORE : selser: 13369 passed / 1627 failed
 WITH THIS PATCH: selser: 13490 passed / 1506 failed

* Also updated debug output for the 'dump:changetree' to emit DOM
  before/after changetree application (which is what highlighted
  the bug by showing far fewer changes on the DOM than what the
  changetree indicated).

Change-Id: I73ed5aa55191e3465e229ccf4dc345ec6189abd0
---
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.js
2 files changed, 987 insertions(+), 1,094 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73ed5aa55191e3465e229ccf4dc345ec6189abd0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] LUASANDBOX_G requires the tsrm_ls to be present. - change (mediawiki...luasandbox)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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


Change subject: LUASANDBOX_G requires the tsrm_ls to be present.
..

LUASANDBOX_G requires the tsrm_ls to be present.

Change-Id: I25a94bd9a7501384992e82630f1d3f617b4ca8dd
---
M luasandbox.c
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/28/97928/1

diff --git a/luasandbox.c b/luasandbox.c
index d353f06..50ea359 100644
--- a/luasandbox.c
+++ b/luasandbox.c
@@ -315,6 +315,7 @@
 
 static int luasandbox_post_deactivate() /* {{{ */
 {
+   TSRMLS_FETCH();
if (LUASANDBOX_G(signal_handler_installed)) {
luasandbox_timer_remove_handler(LUASANDBOX_G(old_handler));
LUASANDBOX_G(signal_handler_installed) = 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25a94bd9a7501384992e82630f1d3f617b4ca8dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Installation instructions for FastStringSearch - change (translatewiki)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Installation instructions for FastStringSearch
..


Installation instructions for FastStringSearch

For Translate API:messagegroups it improves
performance quite a bit, tested with ab:

  min  mean[+/-sd] median   max
Total:   6790 7126 451.5   69858532
Total (fss): 2253 2354  72.7   23532547

Change-Id: I110f58d598930c9eb2e795f9e0e8a65e0f8599ff
---
M puppet/README
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/puppet/README b/puppet/README
index 703e705..10d4de3 100644
--- a/puppet/README
+++ b/puppet/README
@@ -34,7 +34,7 @@
 
 --
 
-Install wikidiff
+Install wikidiff and FastStringSearch
 
 cd /www/translatewiki.net/w/extensions/wikidiff2
 b phpize
@@ -45,6 +45,9 @@
 Create /etc/php5/conf.d/20-wikidiff2.ini:
   extension=wikidiff2.so
 
+Adapt the same for FastStringSearch which is located at
+https://gerrit.wikimedia.org/r/mediawiki/php/FastStringSearch
+
 And restart php5-fpm if needed.
 
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I110f58d598930c9eb2e795f9e0e8a65e0f8599ff
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Allow Flow to connect to separate DB cluster - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Allow Flow to connect to separate DB cluster
..


Allow Flow to connect to separate DB cluster

This should be backwards compatible: default cluster value of false should load
the core database (where we currently only write data to)

With this, we can now setup Flow data on a separate database.
1 known caveat: update.php will for now always apply patches to core DB, so it
can't be used to patch Flow queries if the data lives somewhere else. We should
get that addressed some time.

Change-Id: I5ec7f3252903a54f82ee9ca4c8aada3ccf0e70c1
---
M Flow.php
M container.php
M includes/DbFactory.php
3 files changed, 44 insertions(+), 8 deletions(-)

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



diff --git a/Flow.php b/Flow.php
index dedc634..16d8777 100755
--- a/Flow.php
+++ b/Flow.php
@@ -177,6 +177,13 @@
 // URL for more information about the Flow notification system
 $wgFlowHelpPage = 
'//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:Flow';
 
+// $wgFlowCluster will define what external DB server should be used.
+// If set to false, the current database (wfGetDB) will be used to read/write
+// data from/to. If Flow data is supposed to be stored on an external database,
+// set the value of this variable to the $wgExternalServers key representing
+// that external connection.
+$wgFlowCluster = false;
+
 // Database to use for Flow metadata.  Set to false to use the wiki db.  Any 
number of wikis can
 // and should share the same Flow database.
 $wgFlowDefaultWikiDb = false;
diff --git a/container.php b/container.php
index 0a590f1..40e61cb 100644
--- a/container.php
+++ b/container.php
@@ -17,8 +17,8 @@
 
 // Always returns the correct database for flow storage
 $c['db.factory'] = $c-share( function( $c ) {
-   global $wgFlowDefaultWikiDb;
-   return new Flow\DbFactory( $wgFlowDefaultWikiDb );
+   global $wgFlowDefaultWikiDb, $wgFlowCluster;
+   return new Flow\DbFactory( $wgFlowDefaultWikiDb, $wgFlowCluster );
 } );
 
 // Database Access Layer external from main implementation
diff --git a/includes/DbFactory.php b/includes/DbFactory.php
index b48bc69..3ce6680 100644
--- a/includes/DbFactory.php
+++ b/includes/DbFactory.php
@@ -3,20 +3,49 @@
 namespace Flow;
 
 /**
- * Super simple class,  provide the name of the wiki used for flow
- * data.  All classes within flow that need to access the db will go through
- * here
+ * All classes within Flow that need to access the Flow db will go through 
here.
+ *
+ * To access core tables, use wfGetDB() etc. This is solely for Flow-specific
+ * data, which may live on a separate database.
  */
 class DbFactory {
-   public function __construct( $wiki = false ) {
+   /**
+* @var string|bool Wiki ID, or false for the current wiki
+*/
+   protected $wiki;
+
+   /**
+* @var string|bool External storage cluster, or false for core
+*/
+   protected $cluster;
+
+   /**
+* @var string|bool[optional] $wiki Wiki ID, or false for the current 
wiki
+* @var string|bool[optional] $cluster External storage cluster, or 
false for core
+*/
+   public function __construct( $wiki = false, $cluster = false ) {
$this-wiki = $wiki;
+   $this-cluster = $cluster;
}
 
+   /**
+* @param int $db Index of the connection to get (DB_MASTER, DB_SLAVE or
+* specific server index)
+* @param mixed $groups Query groups
+* @return \DatabaseBase
+*/
public function getDB( $db, $groups = array() ) {
-   return wfGetDB( $db, $groups, $this-wiki );
+   return $this-getLB()-getConnection( $db, $groups, $this-wiki 
);
}
 
+   /**
+* @return \LoadBalancer
+*/
public function getLB() {
-   return wfGetLB( $this-wiki );
+   if ( $this-cluster !== false ) {
+   return wfGetLBFactory()-getExternalLB( $this-cluster, 
$this-wiki );
+   } else {
+   return wfGetLB( $this-wiki );
+   }
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ec7f3252903a54f82ee9ca4c8aada3ccf0e70c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Use Html::hidden instead of Html::input - change (mediawiki...TemplateSandbox)

[Jackmcbarn (Code Review)]

Jackmcbarn has uploaded a new change for review.

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


Change subject: Use Html::hidden instead of Html::input
..

Use Html::hidden instead of Html::input

Generate hidden fields with Html::hidden instead of Html::input

Change-Id: I5f7e4f2ac284f82d3fe6547731ce99340c5c
---
M TemplateSandbox.hooks.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox 
refs/changes/29/97929/1

diff --git a/TemplateSandbox.hooks.php b/TemplateSandbox.hooks.php
index 9f1e4a4..a5f7b64 100644
--- a/TemplateSandbox.hooks.php
+++ b/TemplateSandbox.hooks.php
@@ -252,12 +252,12 @@
 
$html = Xml::openElement( 'span', array( 'id' = 
'templatesandbox-editform' ) );
 
-   $html .= Html::input( 'wpTemplateSandboxTemplate',
-   $editpage-templatesandbox_template, 'hidden', 
array( 'id' = 'wpTemplateSandboxTemplate' )
+   $html .= Html::hidden( 'wpTemplateSandboxTemplate',
+   $editpage-templatesandbox_template, array( 
'id' = 'wpTemplateSandboxTemplate' )
);
 
-   $html .= Html::input( 'wpTemplateSandboxPage',
-   $editpage-templatesandbox_page, 'hidden', 
array( 'id' = 'wpTemplateSandboxPage' )
+   $html .= Html::hidden( 'wpTemplateSandboxPage',
+   $editpage-templatesandbox_page, array( 'id' = 
'wpTemplateSandboxPage' )
);
 
$html .= Xml::closeElement( 'span' );
@@ -285,8 +285,8 @@
$html .= Xml::tags( 'div', $textAttrs, $text-parse() ) 
. \n;
}
 
-   $html .= Html::input( 'wpTemplateSandboxTemplate',
-   $editpage-templatesandbox_template, 'hidden', array( 
'id' = 'wpTemplateSandboxTemplate' )
+   $html .= Html::hidden( 'wpTemplateSandboxTemplate',
+   $editpage-templatesandbox_template, array( 'id' = 
'wpTemplateSandboxTemplate' )
);
 
$labelText = wfMessage( 'templatesandbox-editform-page-label' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f7e4f2ac284f82d3fe6547731ce99340c5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix notices on undefined $fileHandle and $res - change (mediawiki/core)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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


Change subject: Fix notices on undefined $fileHandle and $res
..

Fix notices on undefined $fileHandle and $res

Change-Id: If9f37549af85df0a418dbd12a7793e5a45868f61
---
M maintenance/cdb.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/97930/1

diff --git a/maintenance/cdb.php b/maintenance/cdb.php
index bda64f3..1772b5f 100644
--- a/maintenance/cdb.php
+++ b/maintenance/cdb.php
@@ -52,7 +52,7 @@
$bad = false;
$showhelp = false;
$quit = false;
-   static $fileHandle;
+   static $fileHandle = false;
 
$line = Maintenance::readconsole();
if ( $line === false ) {
@@ -98,6 +98,7 @@
$res = $fileHandle-get( $args[0] );
} catch ( CdbException $e ) {
print Unable to read key from file\n;
+   break;
}
if ( $res === false ) {
print No such key/value pair\n;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9f37549af85df0a418dbd12a7793e5a45868f61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] LUASANDBOX_G requires the tsrm_ls to be present. - change (mediawiki...luasandbox)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: LUASANDBOX_G requires the tsrm_ls to be present.
..


LUASANDBOX_G requires the tsrm_ls to be present.

Change-Id: I25a94bd9a7501384992e82630f1d3f617b4ca8dd
---
M luasandbox.c
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/luasandbox.c b/luasandbox.c
index d353f06..50ea359 100644
--- a/luasandbox.c
+++ b/luasandbox.c
@@ -315,6 +315,7 @@
 
 static int luasandbox_post_deactivate() /* {{{ */
 {
+   TSRMLS_FETCH();
if (LUASANDBOX_G(signal_handler_installed)) {
luasandbox_timer_remove_handler(LUASANDBOX_G(old_handler));
LUASANDBOX_G(signal_handler_installed) = 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25a94bd9a7501384992e82630f1d3f617b4ca8dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Plug leaks on error paths. - change (mediawiki...luasandbox)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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


Change subject: Plug leaks on error paths.
..

Plug leaks on error paths.

Found with 'make test' on a --enable-debug php build (which does leak checking).

Change-Id: If231d7a1ee126fad8e4f9ca818b243750c32cf2b
---
M data_conversion.c
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/31/97931/1

diff --git a/data_conversion.c b/data_conversion.c
index be7af4e..6c1c823 100644
--- a/data_conversion.c
+++ b/data_conversion.c
@@ -297,6 +297,7 @@
}
 
if (!success) {
+   zval_ptr_dtor(z);
return 0;
}
break;
@@ -393,9 +394,10 @@
 
lua_pushnil(L);
while (lua_next(L, index) != 0) {
-   MAKE_STD_ZVAL(value);
+   ALLOC_INIT_ZVAL(value);
if (!luasandbox_lua_to_zval(value, L, -1, sandbox_zval, 
recursionGuard TSRMLS_CC)) {
// Conversion failed, fix stack and bail
+   zval_ptr_dtor(value);
lua_settop(L, top);
return 0;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If231d7a1ee126fad8e4f9ca818b243750c32cf2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix notices on undefined $fileHandle and $res - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix notices on undefined $fileHandle and $res
..


Fix notices on undefined $fileHandle and $res

Change-Id: If9f37549af85df0a418dbd12a7793e5a45868f61
---
M maintenance/cdb.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/cdb.php b/maintenance/cdb.php
index bda64f3..1772b5f 100644
--- a/maintenance/cdb.php
+++ b/maintenance/cdb.php
@@ -52,7 +52,7 @@
$bad = false;
$showhelp = false;
$quit = false;
-   static $fileHandle;
+   static $fileHandle = false;
 
$line = Maintenance::readconsole();
if ( $line === false ) {
@@ -98,6 +98,7 @@
$res = $fileHandle-get( $args[0] );
} catch ( CdbException $e ) {
print Unable to read key from file\n;
+   break;
}
if ( $res === false ) {
print No such key/value pair\n;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9f37549af85df0a418dbd12a7793e5a45868f61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update version - change (mediawiki...Translate)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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


Change subject: Update version
..

Update version

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/32/97932/1

diff --git a/Translate.php b/Translate.php
index 83f0228..2024aec 100644
--- a/Translate.php
+++ b/Translate.php
@@ -17,7 +17,7 @@
 /**
  * Version number used in extension credits and in other places where needed.
  */
-define( 'TRANSLATE_VERSION', '2013-10-27' );
+define( 'TRANSLATE_VERSION', '2013-11-27' );
 
 /**
  * Extension credits properties.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f368a0307bbcca0f239ce2cc4af2fbd8dadad6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update version - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update version
..


Update version

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

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



diff --git a/Translate.php b/Translate.php
index 83f0228..2024aec 100644
--- a/Translate.php
+++ b/Translate.php
@@ -17,7 +17,7 @@
 /**
  * Version number used in extension credits and in other places where needed.
  */
-define( 'TRANSLATE_VERSION', '2013-10-27' );
+define( 'TRANSLATE_VERSION', '2013-11-27' );
 
 /**
  * Extension credits properties.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52f368a0307bbcca0f239ce2cc4af2fbd8dadad6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Use new octal syntax - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use new octal syntax
..


Use new octal syntax

Change-Id: I9f6fbfef1c2cb7ea453a25b8a8c36990950f8000
---
M pywikibot/config2.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index c758295..25df6d2 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -139,7 +139,7 @@
 else:
 base_dir = os.path.join(home, . + NAME)
 if not os.path.isdir(base_dir):
-os.makedirs(base_dir, mode=0700)
+os.makedirs(base_dir, mode=0o700)
 if not os.path.isabs(base_dir):
 base_dir = os.path.normpath(os.path.join(os.getcwd(), base_dir))
 # make sure this path is valid and that it contains user-config file
@@ -671,7 +671,7 @@
 _filemode = _filestatus[0]
 _fileuid = _filestatus[4]
 if __sys.platform == 'win32' or _fileuid in [os.getuid(), 0]:
-if __sys.platform == 'win32' or _filemode  002 == 0 or True:
+if __sys.platform == 'win32' or _filemode  0o02 == 0 or True:
 execfile(_filename)
 else:
 print WARNING: Skipped '%(fn)s': writeable by others. \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f6fbfef1c2cb7ea453a25b8a8c36990950f8000
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Aaron1011 aa1ron...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove uses of execfile - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove uses of execfile
..


Remove uses of execfile

Change-Id: Ieb54337e6b391fbc5a0740bc09f3d40011f7e2c9
---
M pywikibot/config2.py
M pywikibot/fixes.py
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 25df6d2..9f586c3 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -672,7 +672,7 @@
 _fileuid = _filestatus[4]
 if __sys.platform == 'win32' or _fileuid in [os.getuid(), 0]:
 if __sys.platform == 'win32' or _filemode  0o02 == 0 or True:
-execfile(_filename)
+exec(compile(open(_filename).read(), _filename, 'exec'))
 else:
 print WARNING: Skipped '%(fn)s': writeable by others. \
   % {'fn': _filename}
diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py
index 4802292..aafc6f0 100644
--- a/pywikibot/fixes.py
+++ b/pywikibot/fixes.py
@@ -660,6 +660,6 @@
 from pywikibot import config
 
 try:
-execfile(config.datafilepath(user-fixes.py))
+exec(compile(open(config.datafilepath(user-fixes.py)).read(), 
config.datafilepath(user-fixes.py), 'exec'))
 except IOError:
 pass

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb54337e6b391fbc5a0740bc09f3d40011f7e2c9
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Aaron1011 aa1ron...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix config - change (operations/mediawiki-config)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: Fix  config
..

Fix  config

For starters, it's definition was not properly configured.
And it was being extracted as $wgFlowOccupyPages before Flow.php was required,
so Flow would keep overwriting it with it's default value.

Change-Id: Icb402ee832edef334256b38614a3e74eed2d5ef8
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/33/97933/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 030bafb..0cc63e9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2333,6 +2333,7 @@
 if ( $wmgUseFlow ) {
require_once( $IP/extensions/Flow/Flow.php );
$wgFlowEditorList = $wmgFlowEditorList;
+   $wgFlowOccupyPages = $wmgFlowOccupyPages;
 }
 
 if ( $wmgUseDisambiguator ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 3e1ba82..7bfb810 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -304,8 +304,11 @@
'wmgUseFlow' = array(
'enwiki' = true,
),
+
# Extension:Flow's browsertests use Talk:Flow_QA.
-   'wgFlowOccupyPages' = array( 'Talk:Flow QA', 'Talk:Flow' ),
+   'wmgFlowOccupyPages' = array(
+   'enwiki' = array( 'Talk:Flow QA', 'Talk:Flow' ),
+   ),
 
'wmgBug54847' = array(
'default' = false,
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3998144..36a920f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12306,6 +12306,10 @@
'default' = array( 'none' ),
 ),
 
+'wmgFlowOccupyPages' = array(
+   'default' = array(),
+),
+
 'wmgUseDisambiguator' = array(
'default' = true,
 ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb402ee832edef334256b38614a3e74eed2d5ef8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix 'except' syntax - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix 'except' syntax
..


Fix 'except' syntax

Change-Id: I40e1258f9ddee9a8974dc32eccb14eb2c03457ce
---
M pywikibot/comms/threadedhttp.py
M pywikibot/data/api.py
M pywikibot/login.py
M pywikibot/page.py
M pywikibot/site.py
M pywikibot/userinterfaces/terminal_interface_base.py
6 files changed, 20 insertions(+), 20 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 0b6afbc..800af44 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -218,7 +218,7 @@
 self, uri, method, body, headers,
 max_redirects, connection_type
 )
-except Exception, e:  # what types?
+except Exception as e:  # what types?
 # return exception instance to be retrieved by the calling thread
 return e
 self.follow_redirects = follow_redirects
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 60a4cb5..313f2e2 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -297,7 +297,7 @@
 pywikibot.error(traceback.format_exc())
 raise
 #TODO: what other exceptions can occur here?
-except Exception, e:
+except Exception as e:
 # for any other error on the http request, wait and retry
 pywikibot.error(traceback.format_exc())
 pywikibot.log(u%s, %s % (uri, paramstring))
diff --git a/pywikibot/login.py b/pywikibot/login.py
index 536d5ff..e3ecc78 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -173,7 +173,7 @@
  % {'name': self.username, 'site': self.site})
 try:
 cookiedata = self.getCookie()
-except pywikibot.data.api.APIError, e:
+except pywikibot.data.api.APIError as e:
 pywikibot.error(uLogin failed (%s). % e.code)
 if retry:
 self.password = None
diff --git a/pywikibot/page.py b/pywikibot/page.py
index a533304..de17185 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -304,7 +304,7 @@
 or self._revisions[self._revid].text is None:
 try:
 self.site.loadrevisions(self, getText=True, sysop=sysop)
-except (pywikibot.NoPage, pywikibot.SectionError), e:
+except (pywikibot.NoPage, pywikibot.SectionError) as e:
 self._getexception = e
 raise
 
@@ -831,13 +831,13 @@
 raise pywikibot.PageNotSaved(link)
 else:
 pywikibot.output(uPage %s saved % link)
-except pywikibot.LockedPage, err:
+except pywikibot.LockedPage as err:
 # re-raise the LockedPage exception so that calling program
 # can re-try if appropriate
 if not callback and not async:
 raise
 # TODO: other expected error types to catch?
-except pywikibot.Error, err:
+except pywikibot.Error as err:
 pywikibot.log(uError saving page %s (%s)\n % (link, err),
   exc_info=True)
 if not callback and not async:
@@ -1288,7 +1288,7 @@
 if answer in ['y', 'Y']:
 try:
 return self.site.deletepage(self, reason)
-except pywikibot.NoUsername, e:
+except pywikibot.NoUsername as e:
 if mark:
 raise NotImplementedError(
 Marking pages for deletion is not yet available.)
@@ -1479,7 +1479,7 @@
 except pywikibot.EditConflict:
 pywikibot.output(u'Skipping %s because of edit conflict'
  % self.title())
-except pywikibot.SpamfilterError, e:
+except pywikibot.SpamfilterError as e:
 pywikibot.output(u'Skipping %s because of blacklist entry %s'
  % (self.title(), e.url))
 except pywikibot.LockedPage:
@@ -1488,7 +1488,7 @@
 except pywikibot.NoUsername:
 pywikibot.output(u'Page %s not saved; sysop privileges '
  u'required.' % self.title(asLink=True))
-except pywikibot.PageNotSaved, error:
+except pywikibot.PageNotSaved as error:
 pywikibot.output(u'Saving page %s failed: %s'
  % (self.title(asLink=True), error.message))
 
@@ -2233,7 +2233,7 @@
 try:
 self.site.blockuser(self, expiry, reason, anononly, nocreate,
 autoblock, noemail, reblock)
-except pywikibot.data.api.APIError, err:
+except pywikibot.data.api.APIError as err:
 if 

[MediaWiki-commits] [Gerrit] Fix 'raise' syntax - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix 'raise' syntax
..


Fix 'raise' syntax

Change-Id: If63afd6f6cc4b2f98e4e858f65337b6c5d08514e
---
M pywikibot/site.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/site.py b/pywikibot/site.py
index 71238b9..a64bea1 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3592,7 +3592,7 @@
 req = api.Request(site=self, **params)
 data = req.submit()
 if not 'success' in data:
-raise pywikibot.data.api.APIError, data['errors']
+raise pywikibot.data.api.APIError(data['errors'])
 return data['entities']
 
 def preloaditempages(self, pagelist, groupsize=50):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If63afd6f6cc4b2f98e4e858f65337b6c5d08514e
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Aaron1011 aa1ron...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Make setUp and tearDown protected in tests - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Make setUp and tearDown protected in tests
..


Make setUp and tearDown protected in tests

These are protected in the parent MediaWikiTestCase and
PHPUnit_Framework_TestCase. No good reason to make them public.

Change-Id: I45ecc0e4209f0c3b27e63a550112e4e0ddf6e530
---
M tests/phpunit/includes/RevisionStorageTest.php
M tests/phpunit/includes/SpecialPageTest.php
M tests/phpunit/includes/TitleMethodsTest.php
M tests/phpunit/includes/api/ApiEditPageTest.php
M tests/phpunit/includes/content/ContentHandlerTest.php
M tests/phpunit/includes/content/WikitextContentHandlerTest.php
M tests/phpunit/includes/diff/DifferenceEngineTest.php
M tests/phpunit/includes/parser/TidyTest.php
8 files changed, 12 insertions(+), 11 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/includes/RevisionStorageTest.php 
b/tests/phpunit/includes/RevisionStorageTest.php
index 90ef553..7e275a5 100644
--- a/tests/phpunit/includes/RevisionStorageTest.php
+++ b/tests/phpunit/includes/RevisionStorageTest.php
@@ -56,7 +56,7 @@
}
}
 
-   public function tearDown() {
+   protected function tearDown() {
global $wgExtraNamespaces, $wgNamespaceContentModels, 
$wgContentHandlers, $wgContLang;
 
parent::tearDown();
diff --git a/tests/phpunit/includes/SpecialPageTest.php 
b/tests/phpunit/includes/SpecialPageTest.php
index a29d527..65057a5 100644
--- a/tests/phpunit/includes/SpecialPageTest.php
+++ b/tests/phpunit/includes/SpecialPageTest.php
@@ -10,7 +10,7 @@
  */
 class SpecialPageTest extends MediaWikiTestCase {
 
-   public function setUp() {
+   protected function setUp() {
parent::setUp();
 
$this-setMwGlobals( array(
diff --git a/tests/phpunit/includes/TitleMethodsTest.php 
b/tests/phpunit/includes/TitleMethodsTest.php
index 3079d73..55a17ac 100644
--- a/tests/phpunit/includes/TitleMethodsTest.php
+++ b/tests/phpunit/includes/TitleMethodsTest.php
@@ -9,7 +9,7 @@
  */
 class TitleMethodsTest extends MediaWikiTestCase {
 
-   public function setUp() {
+   protected function setUp() {
global $wgContLang;
 
parent::setUp();
@@ -33,7 +33,7 @@
$wgContLang-resetNamespaces(); # reset namespace cache
}
 
-   public function tearDown() {
+   protected function tearDown() {
global $wgContLang;
 
parent::tearDown();
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php 
b/tests/phpunit/includes/api/ApiEditPageTest.php
index 8fe08e1..2709d52 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -13,7 +13,7 @@
  */
 class ApiEditPageTest extends ApiTestCase {
 
-   public function setUp() {
+   protected function setUp() {
global $wgExtraNamespaces, $wgNamespaceContentModels, 
$wgContentHandlers, $wgContLang;
 
parent::setUp();
@@ -30,7 +30,7 @@
$this-doLogin();
}
 
-   public function tearDown() {
+   protected function tearDown() {
global $wgExtraNamespaces, $wgNamespaceContentModels, 
$wgContentHandlers, $wgContLang;
 
unset( $wgExtraNamespaces[12312] );
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php 
b/tests/phpunit/includes/content/ContentHandlerTest.php
index aedf594..d1c214a 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -10,7 +10,7 @@
  */
 class ContentHandlerTest extends MediaWikiTestCase {
 
-   public function setUp() {
+   protected function setUp() {
global $wgContLang;
parent::setUp();
 
@@ -38,7 +38,7 @@
$wgContLang-resetNamespaces();
}
 
-   public function tearDown() {
+   protected function tearDown() {
global $wgContLang;
 
// Reset namespace cache
diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php 
b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
index 7c62dca..73b975b 100644
--- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -10,7 +10,7 @@
 */
var $handler;
 
-   public function setUp() {
+   protected function setUp() {
parent::setUp();
 
$this-handler = ContentHandler::getForModelID( 
CONTENT_MODEL_WIKITEXT );
diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php 
b/tests/phpunit/includes/diff/DifferenceEngineTest.php
index 5c3f36a..f95eb5e 100644
--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
+++ 

[MediaWiki-commits] [Gerrit] Removed 'Disable browser page caching user preference - change (mediawiki/core)

[01tonythomas (Code Review)]

01tonythomas has uploaded a new change for review.

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


Change subject: Removed 'Disable browser page caching user preference
..

Removed 'Disable browser page caching user preference

It is  a very advanced user preference with little usage and is often 
misleading.

Bug: 52809
Change-Id: I6d6b01a82eb8f586c62849ca24dae8dfa23bc174
---
M RELEASE-NOTES-1.23
M includes/AjaxResponse.php
M includes/DefaultSettings.php
M includes/OutputPage.php
M includes/Preferences.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
7 files changed, 1 insertion(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/97934/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 64c55f5..da6a3a1 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -69,6 +69,7 @@
 * The global variable $wgArticle has been removed after a lengthy deprecation
 * mediawiki.util: mw.util.wikiGetlink has been renamed to getUrl. (The old 
name still
   works, but is deprecated.)
+* (bug 52809) Removed Disable browser page caching from user preference.
 
 == Compatibility ==
 
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index d553652..037ef9a 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -224,11 +224,6 @@
return false;
}
 
-   if ( $wgUser-getOption( 'nocache' ) ) {
-   wfDebug( $fname: USER DISABLED CACHE\n, false );
-   return false;
-   }
-
$timestamp = wfTimestamp( TS_MW, $timestamp );
$lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, 
$wgUser-getTouched(), $wgCacheEpoch ) );
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2d1ddcb..b10ae45 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3988,7 +3988,6 @@
'math' = 1,
'minordefault' = 0,
'newpageshidepatrolled' = 0,
-   'nocache' = 0,
'noconvertlink' = 0,
'norollbackdiff' = 0,
'numberheadings' = 0,
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b4fda13..879faca 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -687,10 +687,6 @@
wfDebug( __METHOD__ . : CACHE DISABLED\n, false );
return false;
}
-   if ( $this-getUser()-getOption( 'nocache' ) ) {
-   wfDebug( __METHOD__ . : USER DISABLED CACHE\n, false 
);
-   return false;
-   }
 
$timestamp = wfTimestamp( TS_MW, $timestamp );
$modifiedTimes = array(
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c9caf4f..f92413a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -756,11 +756,6 @@
'label-message' = 'tog-showtoc',
);
}
-   $defaultPreferences['nocache'] = array(
-   'type' = 'toggle',
-   'label-message' = 'tog-nocache',
-   'section' = 'rendering/advancedrendering',
-   );
$defaultPreferences['showhiddencats'] = array(
'type' = 'toggle',
'section' = 'rendering/advancedrendering',
diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 2baccf5..7988fd4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -676,7 +676,6 @@
 'tog-minordefault'= 'Mark all edits minor by default',
 'tog-previewontop'= 'Show preview before edit box',
 'tog-previewonfirst'  = 'Show preview on first edit',
-'tog-nocache' = 'Disable browser page caching',
 'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist 
is changed',
 'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',
 'tog-enotifminoredits'= 'Email me also for minor edits of pages and 
files',
diff --git a/maintenance/language/messages.inc 
b/maintenance/language/messages.inc
index 17658a0..98f3632 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -48,7 +48,6 @@
'tog-minordefault',
'tog-previewontop',
'tog-previewonfirst',
-   'tog-nocache',
'tog-enotifwatchlistpages',
'tog-enotifusertalkpages',
'tog-enotifminoredits',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d6b01a82eb8f586c62849ca24dae8dfa23bc174
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] Cleanup variable use in getLanguages - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Cleanup variable use in getLanguages
..


Cleanup variable use in getLanguages

Change-Id: Ie480f701aa2b117fd73f3f1e2cca1cc9994b2605
---
M includes/SkinTemplate.php
1 file changed, 20 insertions(+), 10 deletions(-)

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



diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 7647e51..dde3f37 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -134,15 +134,14 @@
return array();
}
 
-   $out = $this-getOutput();
$userLang = $this-getLanguage();
-
$languageLinks = array();
 
-   foreach ( $out-getLanguageLinks() as $languageLinkText ) {
+   foreach ( $this-getOutput()-getLanguageLinks() as 
$languageLinkText ) {
$languageLinkParts = explode( ':', $languageLinkText, 2 
);
$class = 'interlanguage-link interwiki-' . 
$languageLinkParts[0];
unset( $languageLinkParts );
+
$languageLinkTitle = Title::newFromText( 
$languageLinkText );
if ( $languageLinkTitle ) {
$ilInterwikiCode = 
$languageLinkTitle-getInterwiki();
@@ -156,22 +155,33 @@
 
// CLDR extension or similar is required to 
localize the language name;
// otherwise we'll end up with the autonym 
again.
-   $ilLangLocalName = Language::fetchLanguageName( 
$ilInterwikiCode, $userLang-getCode() );
+   $ilLangLocalName = Language::fetchLanguageName(
+   $ilInterwikiCode,
+   $userLang-getCode()
+   );
 
-   if ( $languageLinkTitle-getText() === '' ) {
-   $ilTitle = wfMessage( 
'interlanguage-link-title-langonly', $ilLangLocalName )-text();
+   $languageLinkTitleText = 
$languageLinkTitle-getText();
+   if ( $languageLinkTitleText === '' ) {
+   $ilTitle = wfMessage(
+   
'interlanguage-link-title-langonly',
+   $ilLangLocalName
+   )-text();
} else {
-   $ilTitle = wfMessage( 
'interlanguage-link-title', $languageLinkTitle-getText(),
-   $ilLangLocalName )-text();
+   $ilTitle = wfMessage(
+   'interlanguage-link-title',
+   $languageLinkTitleText,
+   $ilLangLocalName
+   )-text();
}
 
+   $ilInterwikiCodeBCP47 = wfBCP47( 
$ilInterwikiCode );
$languageLinks[] = array(
'href' = 
$languageLinkTitle-getFullURL(),
'text' = $ilLangName,
'title' = $ilTitle,
'class' = $class,
-   'lang' = wfBCP47( $ilInterwikiCode ),
-   'hreflang' = wfBCP47( $ilInterwikiCode 
),
+   'lang' = $ilInterwikiCodeBCP47,
+   'hreflang' = $ilInterwikiCodeBCP47,
);
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie480f701aa2b117fd73f3f1e2cca1cc9994b2605
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Waldir wal...@email.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] i18n: Revert watchlist damage caused by two word tab name - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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


Change subject: i18n: Revert watchlist damage caused by two word tab name
..

i18n: Revert watchlist damage caused by two word tab name

In I80895b461ee272f1a6ff54199752553426eae956 the watchlist 'Articles'
tab was switched to 'Content pages'. Having two words in a tab causes
serious layout problems on mobile. These tabs should only contain one
word.

Update qqq codes to make this clearer.
Unfortunately I can't think of a better word than article right now
so I've reverted to that pending further thought

Change-Id: I5c886450641ac86e71d26e0c7ec9caceebb2a7d3
---
M MobileFrontend.i18n.php
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/35/97935/1

diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index 3553e48..c5416f3 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -215,7 +215,7 @@
'mobile-frontend-changeslist-ip' = 'Anonymous user',
'mobile-frontend-changeslist-nocomment' = 'no edit summary',
'mobile-frontend-watchlist-filter-all' = 'All',
-   'mobile-frontend-watchlist-filter-articles' = 'Content pages',
+   'mobile-frontend-watchlist-filter-articles' = 'Articles',
'mobile-frontend-watchlist-filter-talk' = 'Talk',
'mobile-frontend-watchlist-filter-other' = 'Other',
'mobile-frontend-watchlist-modified' = 'Modified $1',
@@ -752,13 +752,12 @@
 {{Identical|Anonymous user}}',
'mobile-frontend-changeslist-nocomment' = 'Text to mark an empty edit 
summary in mobile watchlist/history/recentchanges overview.',
'mobile-frontend-watchlist-filter-all' = 'Label on filter selector for 
mobile watchlist: all pages.
-{{Identical|All}}',
-   'mobile-frontend-watchlist-filter-articles' = 'Label on filter 
selector for mobile watchlist: all pages: content pages only.
-{{Identical|Content page}}',
+{{Identical|All}}. This must be a single word for layout reasons.',
+   'mobile-frontend-watchlist-filter-articles' = 'Label on filter 
selector for mobile watchlist: all pages: content pages only. This must be a 
single word for layout reasons.',
'mobile-frontend-watchlist-filter-talk' = 'Label on filter selector 
for mobile watchlist: talk pages.
-{{Identical|Talk}}',
+{{Identical|Talk}}. This must be a single word for layout reasons.',
'mobile-frontend-watchlist-filter-other' = 'Label on filter selector 
for mobile watchlist: other pages (not talk or content page).
-{{Identical|Other}}',
+{{Identical|Other}}. This must be a single word for layout reasons.',
'mobile-frontend-watchlist-modified' = 'Text saying how long ago a 
page in watchlist was updated.
 * $1 - output of {{msg-mw|ago}} (e.g. 15 days ago, 7 hours ago).',
'mobile-frontend-diffview-404-title' = 'Heading on 404 page when bad 
revision id parameter is passed',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c886450641ac86e71d26e0c7ec9caceebb2a7d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Don't show the existing page in list of results of nearby pages - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Don't show the existing page in list of results of nearby pages
..


Don't show the existing page in list of results of nearby pages

Also stop unnecessarily pushing

Bug: 57444
Change-Id: Ib97bd1680f570262e78ba37c29f0c3726fddda04
(cherry picked from commit 8816557a3f5a518adcf1d72dcee5ac91b63b2438)
---
M javascripts/modules/nearby/Nearby.js
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/nearby/NearbyOverlay.js
3 files changed, 14 insertions(+), 4 deletions(-)

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



diff --git a/javascripts/modules/nearby/Nearby.js 
b/javascripts/modules/nearby/Nearby.js
index 92a7f65..946121a 100644
--- a/javascripts/modules/nearby/Nearby.js
+++ b/javascripts/modules/nearby/Nearby.js
@@ -90,7 +90,7 @@
this.$( '.loading' ).show();
} else if ( !options.pages  !options.error  
options.location ) {
this.$( '.loading' ).show();
-   this.api.getPages( options.location, this.range 
).done( function( pages ) {
+   this.api.getPages( options.location, 
this.range, options.exclude ).done( function( pages ) {
self.emit( 'searchResult', pages );
if ( pages.length  0 ) {
self.render( { pages: pages } );
diff --git a/javascripts/modules/nearby/NearbyApi.js 
b/javascripts/modules/nearby/NearbyApi.js
index ecb100a..408c143 100644
--- a/javascripts/modules/nearby/NearbyApi.js
+++ b/javascripts/modules/nearby/NearbyApi.js
@@ -59,7 +59,15 @@
}
return mw.msg( msg, mw.language.convertNumber( d ) );
},
-   getPages: function( location, range ) {
+   /**
+* Renders an error in the existing view
+*
+* @param {Object} location: In form { latitude: 0, longitude: 
2 }
+* @param {Integer} range: Number of meters to perform a 
geosearch for
+* @param {String} exclude: Name of a title to exclude from the 
list of results
+* @return {jQuery.Deferred} Object taking list of pages as 
argument
+*/
+   getPages: function( location, range, exclude ) {
var d = $.Deferred(), self = this;
this.get( {
action: 'query',
@@ -111,8 +119,9 @@
page.proximity = 
self._distanceMessage( page.dist );
}
page.heading = page.title;
-   pages.push( page );
-   return page;
+   if ( exclude !== page.title ) {
+   return page;
+   }
} );
 
pages.sort( function( a, b ) {
diff --git a/javascripts/modules/nearby/NearbyOverlay.js 
b/javascripts/modules/nearby/NearbyOverlay.js
index 8919268..f5bc669 100644
--- a/javascripts/modules/nearby/NearbyOverlay.js
+++ b/javascripts/modules/nearby/NearbyOverlay.js
@@ -27,6 +27,7 @@
source: options.source,
range: 2000,
parentOverlay: this,
+   exclude: options.title,
location: { longitude: 
options.longitude, latitude: options.latitude },
el: this.$( '.container' )
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib97bd1680f570262e78ba37c29f0c3726fddda04
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] RETURN_FALSE instead of return in some methods - change (mediawiki...luasandbox)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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


Change subject: RETURN_FALSE instead of return in some methods
..

RETURN_FALSE instead of return in some methods

There appears to be a codepath in luasandbox_load_helper and in
luasandbox_call_helper where PHP's return_value parameter might never
get set. Other codepaths in these functions call RETURN_FALSE, so let's
do that for these too.

Change-Id: I76609c044ffe8e1d3969945b9a4aefcf0d13318a
---
M luasandbox.c
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/36/97936/1

diff --git a/luasandbox.c b/luasandbox.c
index 50ea359..5d31fb7 100644
--- a/luasandbox.c
+++ b/luasandbox.c
@@ -591,7 +591,7 @@
// Handle any error from luaL_loadbuffer
if (status != 0) {
luasandbox_handle_error(sandbox, status TSRMLS_CC);
-   return;
+   RETURN_FALSE;
}
 
// Make a zval out of it, and return false on error
@@ -1359,7 +1359,7 @@
}
if (sandbox-emergency_timed_out) {
luasandbox_handle_emergency_timeout(sandbox TSRMLS_CC);
-   return;
+   RETURN_FALSE;
}
 
// Handle normal errors

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76609c044ffe8e1d3969945b9a4aefcf0d13318a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Removed 'Disable browser page caching user preference - change (mediawiki/core)

[01tonythomas (Code Review)]

01tonythomas has uploaded a new change for review.

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


Change subject: Removed 'Disable browser page caching user preference
..

Removed 'Disable browser page caching user preference

It is  a very advanced user preference with little usage and is often 
misleading.
Updated release notes.

Bug: 52809
Change-Id: Ie5d1b04039f39baf9a502ba180527d09e2432bcd
---
M RELEASE-NOTES-1.23
M includes/AjaxResponse.php
M includes/DefaultSettings.php
M includes/OutputPage.php
M includes/Preferences.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
7 files changed, 1 insertion(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/97937/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 64c55f5..410c6d3 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -69,6 +69,7 @@
 * The global variable $wgArticle has been removed after a lengthy deprecation
 * mediawiki.util: mw.util.wikiGetlink has been renamed to getUrl. (The old 
name still
   works, but is deprecated.)
+*(Bug 52809) Removed 'Disable browser page caching from user preference
 
 == Compatibility ==
 
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index d553652..037ef9a 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -224,11 +224,6 @@
return false;
}
 
-   if ( $wgUser-getOption( 'nocache' ) ) {
-   wfDebug( $fname: USER DISABLED CACHE\n, false );
-   return false;
-   }
-
$timestamp = wfTimestamp( TS_MW, $timestamp );
$lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, 
$wgUser-getTouched(), $wgCacheEpoch ) );
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2d1ddcb..b10ae45 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3988,7 +3988,6 @@
'math' = 1,
'minordefault' = 0,
'newpageshidepatrolled' = 0,
-   'nocache' = 0,
'noconvertlink' = 0,
'norollbackdiff' = 0,
'numberheadings' = 0,
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b4fda13..879faca 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -687,10 +687,6 @@
wfDebug( __METHOD__ . : CACHE DISABLED\n, false );
return false;
}
-   if ( $this-getUser()-getOption( 'nocache' ) ) {
-   wfDebug( __METHOD__ . : USER DISABLED CACHE\n, false 
);
-   return false;
-   }
 
$timestamp = wfTimestamp( TS_MW, $timestamp );
$modifiedTimes = array(
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c9caf4f..f92413a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -756,11 +756,6 @@
'label-message' = 'tog-showtoc',
);
}
-   $defaultPreferences['nocache'] = array(
-   'type' = 'toggle',
-   'label-message' = 'tog-nocache',
-   'section' = 'rendering/advancedrendering',
-   );
$defaultPreferences['showhiddencats'] = array(
'type' = 'toggle',
'section' = 'rendering/advancedrendering',
diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index 2baccf5..7988fd4 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -676,7 +676,6 @@
 'tog-minordefault'= 'Mark all edits minor by default',
 'tog-previewontop'= 'Show preview before edit box',
 'tog-previewonfirst'  = 'Show preview on first edit',
-'tog-nocache' = 'Disable browser page caching',
 'tog-enotifwatchlistpages'= 'Email me when a page or file on my watchlist 
is changed',
 'tog-enotifusertalkpages' = 'Email me when my user talk page is changed',
 'tog-enotifminoredits'= 'Email me also for minor edits of pages and 
files',
diff --git a/maintenance/language/messages.inc 
b/maintenance/language/messages.inc
index 17658a0..98f3632 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -48,7 +48,6 @@
'tog-minordefault',
'tog-previewontop',
'tog-previewonfirst',
-   'tog-nocache',
'tog-enotifwatchlistpages',
'tog-enotifusertalkpages',
'tog-enotifminoredits',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5d1b04039f39baf9a502ba180527d09e2432bcd

[MediaWiki-commits] [Gerrit] Created an AccumChain obj to use in AsyncTTM transformTokens... - change (mediawiki...Parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Created an AccumChain obj to use in AsyncTTM transformTokens 
loop.
..


Created an AccumChain obj to use in AsyncTTM transformTokens loop.

* Used to be a var with a bunch of properties and functions
  that was treated like a singleton, but constructed each
  time through the transformTokens loop.

* Not sure if this is better/faster.  To be tested.

* No change in parser tests results.

Change-Id: I07ea407bea9850f0818169eb622d21ec6ceb60fa
---
M js/lib/mediawiki.TokenTransformManager.js
1 file changed, 68 insertions(+), 63 deletions(-)

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



diff --git a/js/lib/mediawiki.TokenTransformManager.js 
b/js/lib/mediawiki.TokenTransformManager.js
index 1003e2c..b1f5bca 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -443,6 +443,72 @@
 // all instances of the Async TTM.
 AsyncTokenTransformManager.prototype._counter = 0;
 
+function AccumChain(ttm, parentCB) {
+   this.ttm = ttm;
+   this.firstAccum = null;
+   this.accum = null;
+   this.next = null;
+   this.maybeAsyncCB = null;
+   this.numNodes = 0;
+   this.debugId = 0;
+
+   // Shared accum-chain state accessible to synchronous transforms in 
maybeSyncReturn
+   this.state = {
+   // Indicates we are still in the transformTokens loop
+   transforming: true,
+   // debug id for this expansion
+   c: 'c-' + AsyncTokenTransformManager.prototype._counter++
+   };
+
+   this.init(parentCB);
+}
+
+AccumChain.prototype = {
+   makeNextAccum: function(cb) {
+   var cbs = { };
+   var maybeAsyncCB = this.ttm.maybeSyncReturn.bind( this.ttm, 
this.state, cbs );
+
+   // The new accumulator is never used unless we hit async mode.
+   // Even though maybeAsyncCB references newAccum via 
cbs.parentCB,
+   // that code path is exercised only when async mode is entered,
+   // so we are all good on that front.
+   var newAccum = new TokenAccumulator( this.ttm, cb );
+   // 'newAccum' will receive tokens from a child pipeline/cb
+   cbs.parentCB = newAccum.receiveToksFromChild.bind(newAccum);
+   cbs.self = maybeAsyncCB;
+
+   return { accum: newAccum, cb: maybeAsyncCB };
+   },
+   init: function(parentCB) {
+   // Local accum for synchronously returned fully processed tokens
+   // Make localAccum compatible with receiveToksFromSibling
+   var localAccum = [];
+   localAccum.receiveToksFromSibling = function() { return 
parentCB; };
+
+   this.firstAccum = localAccum;
+   this.accum = localAccum;
+   var nextAccumAndCB = this.makeNextAccum( parentCB );
+   this.next = nextAccumAndCB.accum;
+   this.maybeAsyncCB = nextAccumAndCB.cb;
+   this.numNodes = 1;
+   },
+   initRes: function() {
+   this.state.res = {};
+   },
+   addNode: function() {
+   // console.warn(-- ATT- + this.ttm.uid +  new link in 
chain);
+   this.accum = this.next;
+   // 'accum' will receive toks from the 'next' node that will be 
created
+   var nextAccumAndCB = this.makeNextAccum( 
this.accum.receiveToksFromSibling.bind(this.accum) );
+   this.next = nextAccumAndCB.accum;
+   this.maybeAsyncCB = nextAccumAndCB.cb;
+   this.numNodes++;
+   },
+   push: function(tok) {
+   this.accum.push(tok);
+   }
+};
+
 /**
  * Run asynchronous transformations. This is the big workhorse where
  * templates, images, links and other async expansions (see the transform
@@ -464,69 +530,8 @@
 
//console.warn('AsyncTokenTransformManager.transformTokens: ' + 
JSON.stringify(tokens) );
 
-   var accumChain = {
-   ttm: null,
-   firstAccum: null,
-   accum: null,
-   next: null,
-   maybeAsyncCB: null,
-   numNodes: 0,
-   debugId: 0,
-   // Shared accum-chain state accessible to synchronous 
transforms in maybeSyncReturn
-   state: {
-   // Indicates we are still in the transformTokens loop
-   transforming: true,
-   // debug id for this expansion
-   c: 'c-' + 
AsyncTokenTransformManager.prototype._counter++
-   },
-   makeNextAccum: function(cb) {
-   var cbs = { };
-   var maybeAsyncCB = this.ttm.maybeSyncReturn.bind( 
this.ttm, this.state, cbs );
-
-   // The new accumulator is never 

[MediaWiki-commits] [Gerrit] Merge Previous and next functionality! - change (mediawiki...MultimediaViewer)

[Vldandrew (Code Review)]

Vldandrew has uploaded a new change for review.

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


Change subject: Merge Previous and next functionality!
..

Merge Previous and next functionality!

Change-Id: I973655ae106906bbb7ad028df6b80f0703a8b78e
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I973655ae106906bbb7ad028df6b80f0703a8b78e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Vldandrew vldand...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix media viewer for images with unicode characters - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix media viewer for images with unicode characters
..


Fix media viewer for images with unicode characters

Also address FIXMEs related to History.js which we no longer use.

Bug: 57089
Change-Id: I8c8beb79b57d2a14b59fbc695df3262eee53ed59
---
M javascripts/modules/mediaViewer.js
1 file changed, 8 insertions(+), 15 deletions(-)

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



diff --git a/javascripts/modules/mediaViewer.js 
b/javascripts/modules/mediaViewer.js
index a458430..22a9219 100644
--- a/javascripts/modules/mediaViewer.js
+++ b/javascripts/modules/mediaViewer.js
@@ -97,27 +97,20 @@
} );
 
function init( $el ) {
-   M.router.route( /^image\/(.+)$/, function( hrefPart ) {
-   // FIXME: replace hrefPart with title when we get rid 
of History.js
-   // (which apart from slashes doesn't like dots...)
-   var $a = $( 'a[href*=' + hrefPart + ']' ), title = 
$a.data( 'title' );
+   M.router.route( /^image\/(.+)$/, function( title ) {
+   var caption = $( 'a[href*=' + title + ']' ).siblings( 
'.thumbcaption' ).text();
 
-   if ( title ) {
-   new ImageOverlay( {
-   title: $a.data( 'title' ),
-   caption: $a.siblings( '.thumbcaption' 
).text()
-   } ).show();
-   }
+   new ImageOverlay( {
+   title: decodeURIComponent( title ),
+   caption: caption
+   } ).show();
} );
 
$el.find( 'a.image, a.thumbimage' ).each( function() {
-   var $a = $( this ),
-   // FIXME: change to /[^\/]+$/ when we get rid 
of History.js
-   match = $a.attr( 'href' ).match( 
/.*\/(([^\/]+)\..+)$/ );
+   var $a = $( this ), match = $a.attr( 'href' ).match( 
/[^\/]+$/ );
 
if ( match ) {
-   $a.data( 'title', match[1] );
-   $a.attr( 'href', '#image/' + match[2] );
+   $a.attr( 'href', '#image/' + match[0] );
}
} );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c8beb79b57d2a14b59fbc695df3262eee53ed59
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Show using new search engine when using Cirrus - change (operations/mediawiki-config)

[Manybubbles (Code Review)]

Manybubbles has uploaded a new change for review.

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


Change subject: Show using new search engine when using Cirrus
..

Show using new search engine when using Cirrus

Show CirrusSearch's now-using message on the search page when the wiki
is configured to use CirrusSearch as a primary.  This contains a link to
a help page.

Change-Id: I474f1fd8b77ada0500cb6ed842c508999ab3828d
---
M wmf-config/CirrusSearch-common.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/39/97939/1

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 8431198..3689d42 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -22,6 +22,7 @@
$wgSearchType = 'CirrusSearch';
$wgSearchTypeAlternatives = array( 'LuceneSearch' );
$wgEnableLucenePrefixSearch = false;
+   $wgCirrusSearchShowNowUsing = true;
 }
 
 $wgCirrusSearchContentReplicaCount = array( 'content' = 2, 'general' = 2 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I474f1fd8b77ada0500cb6ed842c508999ab3828d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hack: Add hack so modules that use mw.Api can work on mobile... - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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


Change subject: Hack: Add hack so modules that use mw.Api can work on mobile in 
limited form
..

Hack: Add hack so modules that use mw.Api can work on mobile in limited form

Change-Id: I4c92422428de60d2e11ba891fe44dbf43ad99c43
---
M javascripts/common/api.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/40/97940/1

diff --git a/javascripts/common/api.js b/javascripts/common/api.js
index 3609973..59e2abe 100644
--- a/javascripts/common/api.js
+++ b/javascripts/common/api.js
@@ -169,6 +169,8 @@
 
api = new Api();
api.Api = Api;
+   // FIXME: Hack until bug 57629 is resolved.
+   mw.Api = Api;
 
M.define( 'api', api );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c92422428de60d2e11ba891fe44dbf43ad99c43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Improve ProofreadIndexPage parser management - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

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


Change subject: Improve ProofreadIndexPage parser management
..

Improve ProofreadIndexPage parser management

Change-Id: Id4237b865c0044f8ae564afe7787c1614841a9a8
---
M includes/index/ProofreadIndexPage.php
M tests/includes/index/ProofreadIndexPageTest.php
2 files changed, 23 insertions(+), 17 deletions(-)


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

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 49bbaa0..86ef9bd 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -265,15 +265,7 @@
 * @return array of array( Title title of the pointed page, the label 
of the link )
 */
public function getLinksToMainNamespace() {
-   // Instanciate a new parser object to avoid side effects of 
$parser-replaceVariables
-   static $indexParser;
-
-   if ( $indexParser === null ) {
-   $indexParser = new Parser();
-   }
-   $text = $this-getText();
-   $options = new ParserOptions();
-   $rtext = $indexParser-preprocess( $text, $this-title, 
$options );
+   $rtext = self::getParser()-preprocess( $this-getText(), 
$this-title, new ParserOptions() );
return $this-getLinksToNamespace( $rtext, NS_MAIN );
}
 
@@ -405,15 +397,15 @@
 * @return string the value with variables replaced
 */
public function replaceVariablesWithIndexEntries( $name, $otherParams ) 
{
-   global $wgParser;
-
$entry = $this-getIndexEntry( $name );
if ( $entry === null ) {
return null;
}
 
$params = $this-getIndexEntriesForHeaderAsTemplateParams() + 
$otherParams;
-   return $wgParser-replaceVariables( $entry-getStringValue(), 
$params, true );
+   $parser = self::getParser();
+   $parser-startExternalParse( $this-title, new ParserOptions(), 
Parser::OT_PREPROCESS );
+   return $parser-replaceVariables( $entry-getStringValue(), 
$params, true );
}
 
/**
@@ -428,4 +420,21 @@
}
return $params;
}
+
+   /**
+* Return the Parser object done to be used for Index pages internal use
+* Needed to avoid side effects of $parser-replaceVariables
+*
+* @return Parser
+*/
+   protected static function getParser() {
+   global $wgParser;
+   static $parser = null;
+
+   if ( $parser === null ) {
+   $parser = clone $wgParser;
+   }
+
+   return $parser;
+   }
 }
diff --git a/tests/includes/index/ProofreadIndexPageTest.php 
b/tests/includes/index/ProofreadIndexPageTest.php
index 47c8408..2ade8bc 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -180,11 +180,8 @@
}
 
public function testReplaceVariablesWithIndexEntries() {
-   $this-markTestIncomplete( 'TODO Parser fails' ); //TODO
-   return;
-
-   $page = self::newIndexPage( 'Test.djvu', {{\n|Title=Test 
book\n|Header='Page of {{{title}}} by {{{author|}}} number {{{pagenum}}}'\n}} 
);
-   $this-assertEquals( 'Page of Test book by number 22', 
$page-replaceVariablesWithIndexEntries( 'header', array( 'pagenum' = 22 ) ) );
+   $page = self::newIndexPage( 'Test.djvu', {{\n|Title=Test 
book\n|Header=Page of {{{title}}} by {{{author|}}} {{number}} 
{{{pagenum}}}\n}} );
+   $this-assertEquals( 'Page of Test book by  {{number}} 22', 
$page-replaceVariablesWithIndexEntries( 'header', array( 'pagenum' = 22 ) ) );
 
$this-assertNull( $page-replaceVariablesWithIndexEntries( 
'headers', array() ) );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4237b865c0044f8ae564afe7787c1614841a9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr

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

[MediaWiki-commits] [Gerrit] Allow enabling as default with a BetaFeature - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Allow enabling as default with a BetaFeature
..


Allow enabling as default with a BetaFeature

Suggestion: 
https://www.mediawiki.org/wiki/Beta_Features/New_Features#CirrusSearch
Change-Id: Ie905e51edc245c7a1f4579e7eaf63474a69ed930
---
M CirrusSearch.i18n.php
M CirrusSearch.php
M includes/CirrusSearch.body.php
3 files changed, 41 insertions(+), 1 deletion(-)

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



diff --git a/CirrusSearch.i18n.php b/CirrusSearch.i18n.php
index 9d6f7a0..1bbc1d3 100644
--- a/CirrusSearch.i18n.php
+++ b/CirrusSearch.i18n.php
@@ -24,9 +24,12 @@
 External links
 See also
  #/pre !-- leave this line exactly as it is --',
+   'cirrussearch-pref-label' = 'New search',
+   'cirrussearch-pref-desc' = 'Use a new search engine which indexes 
expanded templates, supports more languages, and updates faster.'
 );
 
 /** Message documentation (Message documentation)
+ * @author Kunal Mehta
  * @author Shirayuki
  */
 $messages['qqq'] = array(
@@ -35,6 +38,8 @@
'cirrussearch-backend-error' = 'Error message shown to the users when 
we have an issue communicating with our search backend',
'cirrussearch-now-using' = Note that this wiki is using a new search 
engine with a link for people to learn more.  That'll contain information on 
filing a bug, new syntax, etc.,
'cirrussearch-ignored-headings' = 'Headings that will be ignored by 
search. You can translate the text, including Leave this line exactly as it 
is. Some lines of this messages have one (1) leading space.',
+   'cirrussearch-pref-label' = 'Preference label for option to enable 
CirrusSearch by default',
+   'cirrussearch-pref-desc' = 'Description for option to enable 
CirrusSearch by default',
 );
 
 /** Asturian (asturianu)
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 6791a78..c1bf612 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -141,6 +141,11 @@
 // Show the notification about this wiki using CirrusSearch on the search page.
 $wgCirrusSearchShowNowUsing = false;
 
+// If Cirrus is enabled as a secondary search, allow users to
+// set a preference with Extension:BetaFeatures to set it as
+// their primary search engine.
+$wgCirrusSearchEnablePref = false;
+
 $includes = __DIR__ . /includes/;
 /**
  * Classes
@@ -167,9 +172,17 @@
 $wgHooks[ 'LinksUpdateComplete' ][] = 
'CirrusSearchUpdater::linksUpdateCompletedHook';
 $wgHooks[ 'SoftwareInfo' ][] = 'CirrusSearch::softwareInfoHook';
 $wgHooks[ 'SpecialSearchResultsPrepend' ][] = 
'CirrusSearch::specialSearchResultsPrependHook';
+$wgHooks[ 'GetBetaFeaturePreferences' ][] = 'CirrusSearch::getPreferencesHook';
 // Install our prefix search hook only if we're enabled.
 $wgExtensionFunctions[] = function() {
-   global $wgSearchType, $wgHooks;
+   global $wgSearchType, $wgHooks, $wgCirrusSearchEnablePref;
+   $user = RequestContext::getMain()-getUser();
+   if ( $wgCirrusSearchEnablePref  $user-isLoggedIn()  class_exists( 
'BetaFeatures' )
+BetaFeatures::isFeatureEnabled( $user, 
'cirrussearch-default' )
+   ) {
+   // If the user has the BetaFeature enabled, use Cirrus as 
default
+   $wgSearchType = 'CirrusSearch';
+   }
if ( $wgSearchType === 'CirrusSearch' ) {
$wgHooks['PrefixSearchBackend'][] = 
'CirrusSearch::prefixSearch';
}
diff --git a/includes/CirrusSearch.body.php b/includes/CirrusSearch.body.php
index d5f0611..49250bf 100644
--- a/includes/CirrusSearch.body.php
+++ b/includes/CirrusSearch.body.php
@@ -135,4 +135,26 @@
}
return true;
}
+
+   /**
+* Adds using CirrusSearch as default as a BetaFeature
+* @param User $user
+* @param array $prefs
+* @return bool
+*/
+   public static function getPreferencesHook( $user, $prefs ) {
+   global $wgCirrusSearchEnablePref;
+
+   if ( $wgCirrusSearchEnablePref ) {
+   $prefs['cirrussearch-default'] = array(
+   'label-message' = 'cirrussearch-pref-label',
+   'desc-message' = 'cirrussearch-pref-desc',
+   'info-link' = 
'https://www.mediawiki.org/wiki/Search',
+   'discussion-link' = 
'https://www.mediawiki.org/wiki/Talk:Search',
+   );
+   }
+
+   return true;
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie905e51edc245c7a1f4579e7eaf63474a69ed930
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Aude 

[MediaWiki-commits] [Gerrit] Process HTML pre.../pre as a single, self-contained token - change (mediawiki...Parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Process HTML pre.../pre as a single, self-contained token
..


Process HTML pre.../pre as a single, self-contained token

 * Avoids the nested pre issue in the PreHandler.

 * Cleans up a bit of the ParagraphWrapper and tries to separate behaviour
   of hasOpenPTag and hasOpenHTMLPTag.

 * Adds a test for a pre tag nested in a block.

 * Fixes an issue with the normalizer where nested spans that would
   normally be ignored weren't. This results in a new passing test.

 * This was suggested in:
https://gerrit.wikimedia.org/r/#/c/96678/

 * Relevant commits:
20c6afe7f51d14e978f348f376d58e28a9d2b3df
81ab0f9f1d9a5a0830f1d14a98e10a959d173620
a2025499347494de36ca20570c74d3604d06c627

Change-Id: Id786604fe04196ee2744f238d1dbbd2efc0cbb05
---
M js/lib/ext.core.ParagraphWrapper.js
M js/lib/ext.core.PreHandler.js
M js/lib/ext.core.Sanitizer.js
M js/lib/mediawiki.DOMUtils.js
M js/lib/mediawiki.HTML5TreeBuilder.node.js
M js/lib/pegTokenizer.pegjs.txt
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
8 files changed, 118 insertions(+), 81 deletions(-)

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



diff --git a/js/lib/ext.core.ParagraphWrapper.js 
b/js/lib/ext.core.ParagraphWrapper.js
index a6ff51e..bd11a8b 100644
--- a/js/lib/ext.core.ParagraphWrapper.js
+++ b/js/lib/ext.core.ParagraphWrapper.js
@@ -94,7 +94,6 @@
if (this.hasOpenPTag) {
out.push(new EndTagTk('p'));
this.hasOpenPTag = false;
-   this.hasOpenHTMLPTag = false;
}
 };
 
@@ -116,7 +115,7 @@
// If we dont have an open p-tag, and this line didn't have a block 
token,
// start a p-tag
var l = this.currLine;
-   if (!this.hasOpenPTag  !l.hasBlockToken  l.hasWrappableTokens) {
+   if (!this.hasOpenPTag  !this.hasOpenHTMLPTag  !l.hasBlockToken  
l.hasWrappableTokens) {
l.tokens.unshift(new TagTk('p'));
this.hasOpenPTag = true;
}
@@ -205,53 +204,53 @@
return resToks;
 };
 
-ParagraphWrapper.prototype.onAny = function ( token, frame ) {
-   function updateTableContext(tblTags, token) {
-   // popUntil: pop anything until one of the tag in this array is 
found.
-   //   Pass null to disable.
-   // popThen: after a stop is reached (or popUntil was null), 
continue
-   //  popping as long as the elements in this 
array match. Pass
-   //  null to disable.
-   function popTags(tblTags, popUntil, popThen) {
-   while (popUntil  tblTags.length  0  
popUntil.indexOf(tblTags.last()) === -1) {
-   tblTags.pop();
-   }
-   while (popThen  tblTags.length  0  
popThen.indexOf(tblTags.last()) !== -1) {
-   tblTags.pop();
-   }
-   }
+// popUntil: pop anything until one of the tag in this array is found.
+//   Pass null to disable.
+// popThen: after a stop is reached (or popUntil was null), continue
+// popping as long as the elements in this array match. 
Pass
+// null to disable.
+function popTags(tblTags, popUntil, popThen) {
+   while (popUntil  tblTags.length  0  
popUntil.indexOf(tblTags.last()) === -1) {
+   tblTags.pop();
+   }
+   while (popThen  tblTags.length  0  popThen.indexOf(tblTags.last()) 
!== -1) {
+   tblTags.pop();
+   }
+}
 
-   if (Util.isTableTag(token)) {
-   var tokenName = token.name;
-   if (tc === TagTk) {
-   tblTags.push(tokenName);
-   } else {
-   switch (tokenName) {
-   case table:
-   // Pop a table scope
-   popTags(tblTags, [table], [table]);
-   break;
-   case tbody:
-   // Pop to the nearest table
-   popTags(tblTags, [table], null);
-   break;
-   case tr:
-   case thead:
-   case tfoot:
-   case caption:
-   // Pop to tbody or table, whichever is 
nearer
-   popTags(tblTags, [tbody, table], 
null);
-   break;
-   case td:
-   case th:
-