[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-29 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Iccbd4bfb42a572249846c649f41be0170e6dc399
---
M includes/installer/MysqlUpdater.php
A maintenance/archives/patch-mysql-5.6-searchindex.sql
2 files changed, 34 insertions(+), 0 deletions(-)


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

diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index d414d907..07e717e 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -29,6 +29,17 @@
  */
 class MysqlUpdater extends DatabaseUpdater {
protected function getCoreUpdateList() {
+   $status = $this->getConnection();
+   $conn = $status->value;
+   $version = $conn->getServerVersion();
+
+   if ( version_compare( $version, '5.6' ) < 0 ) {
+   $SearchIndexDrop = [ 'dropTable', 'searchindex' ];
+   $SearchIndexAddTable = [ 'addTable', 'searchindex', 
'patch-mysql-5.6-searchindex.sql' ];
+   } else {
+   $SearchIndexDrop = [ '' ];
+   $SearchIndexAddTable = [ '' ];
+   }
return [
[ 'disableContentHandlerUseDB' ],
 
@@ -283,6 +294,8 @@
[ 'addIndex', 'categorylinks', 'cl_collation_ext',
'patch-add-cl_collation_ext_index.sql' ],
[ 'doCollationUpdate' ],
+   $SearchIndexDrop,
+   $SearchIndexAddTable,
];
}
 
diff --git a/maintenance/archives/patch-mysql-5.6-searchindex.sql 
b/maintenance/archives/patch-mysql-5.6-searchindex.sql
new file mode 100644
index 000..30e7bca
--- /dev/null
+++ b/maintenance/archives/patch-mysql-5.6-searchindex.sql
@@ -0,0 +1,21 @@
+-- This only supports mysql 5.6+
+--
+-- When using the default MySQL search backend, page titles
+-- and text are munged to strip markup, do Unicode case folding,
+-- and prepare the result for MySQL's fulltext index.
+--
+-- This table must be InnoDB;
+--
+CREATE TABLE /*_*/searchindex (
+  -- Key to page_id
+  si_page int unsigned NOT NULL,
+
+  -- Munged version of title
+  si_title varchar(255) NOT NULL default '',
+
+  -- Munged version of body text
+  si_text mediumtext NOT NULL,
+  FULLTEXT KEY si_title (si_title, si_text)
+) /*$wgDBTableOptions*/;
+
+CREATE UNIQUE INDEX /*i*/si_page ON /*_*/searchindex (si_page);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccbd4bfb42a572249846c649f41be0170e6dc399
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-29 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: I5dfcd85693e461f0b2f92acb4be3a3d6143f884c
---
M includes/PHPVersionCheck.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/291588/1

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index ab8aada..c21e892 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -31,7 +31,7 @@
  */
 function wfEntryPointCheck( $entryPoint ) {
$mwVersion = '1.28';
-   $minimumVersionPHP = '5.5.9';
+   $minimumVersionPHP = '5.6.9';
$phpVersion = PHP_VERSION;
 
if ( !function_exists( 'version_compare' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dfcd85693e461f0b2f92acb4be3a3d6143f884c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-28 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Ic90c036539b106a68f57c64d5e8d5a95d3fc4e18
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/291529/1

diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 3ebc3ec..5cdff7d 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1262,6 +1262,8 @@
$vars['wgDBTableOptions']
);
 
+   $vars['wgDBTableOptionsSearch'] = "ENGINE=MyISAM DEFAULT 
CHARSET=utf8";
+
return $vars;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic90c036539b106a68f57c64d5e8d5a95d3fc4e18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-28 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: I8a4eeff517891101e56f41dded28a35fe49c8861
---
M maintenance/tables.sql
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/291520/1

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 89aeb9c..dda3229 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1178,7 +1178,7 @@
 
   -- Munged version of body text
   si_text mediumtext NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=binary;
 
 CREATE UNIQUE INDEX /*i*/si_page ON /*_*/searchindex (si_page);
 CREATE FULLTEXT INDEX /*i*/si_title ON /*_*/searchindex (si_title);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a4eeff517891101e56f41dded28a35fe49c8861
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-22 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Ifd97feb76228c170a547e3b98c517f8a478bd8f3
---
M includes/PHPVersionCheck.php
1 file changed, 50 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/290072/1

diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index 1eafcfa..845fefb 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -33,8 +33,17 @@
$mwVersion = '1.27';
$minimumVersionPHP = '5.5.9';
$phpVersion = PHP_VERSION;
+   $minimumVersionHHVM = '3.14';
+   $hhvmVersion = HHVM_VERSION;
 
if ( !function_exists( 'version_compare' )
+   || version_compare( $phpVersion, $minimumVersionPHP ) < 0
+   && version_compare( $hhvmVersion, $minimumVersionHHVM ) < 0
+   ) {
+   wfHHVMVersionError(
+   $entryPoint, $mwVersion, $minimumVersionPHP, 
$phpVersion, $minimumVersionHHVM, $hhvmVersion
+   );
+   } elseif ( !function_exists( 'version_compare' )
|| version_compare( $phpVersion, $minimumVersionPHP ) < 0
) {
wfPHPVersionError( $entryPoint, $mwVersion, $minimumVersionPHP, 
$phpVersion );
@@ -176,6 +185,47 @@
 }
 
 /**
+ * Display an error for the minimum PHP and HHVM version requirement not being 
satisfied.
+ *
+ * @param string $type See wfGenericError
+ * @param string $mwVersion See wfGenericError
+ * @param string $minimumVersionPHP The minimum PHP version supported by 
MediaWiki
+ * @param string $phpVersion The current PHP version
+ * @param string $minimumVersionHHVM The minimum HHVM version supported by 
MediaWiki
+ * @param string $hhvmVersion The current HHVM version
+ */
+function wfHHVMVersionError(
+   $type, $mwVersion, $minimumVersionPHP, $phpVersion, 
$minimumVersionHHVM, $hhvmVersion
+) {
+   $shortText = "MediaWiki $mwVersion requires at least "
+   . "PHP version $minimumVersionPHP and HHVM version 
$minimumVersionHHVM,
+   you are using PHP $phpVersion and HHVM $hhvmVersion.";
+
+   $longText = "Error: You might be using on older PHP version. \n"
+   . "MediaWiki $mwVersion needs PHP $minimumVersionPHP and HHVM 
$minimumVersionHHVM or higher.\n\n"
+   . "Check if you have a newer php executable with a different 
name, such as php5.\n\n";
+
+   $longHtml = <upgrading your copy of PHP.
+   PHP versions less than 5.5.0 are no longer supported by 
the PHP Group and will not receive
+   security or bugfix updates.
+
+   Also please consider upgrading https://docs.hhvm.com/hhvm/installation/introduction;>
+   upgrading your copy of HHVM
+   
+   
+   If for some reason you are unable to upgrade your PHP 
version, you will need to
+   https://www.mediawiki.org/wiki/Download;>download an older version
+   of MediaWiki from our website.  See our
+   https://www.mediawiki.org/wiki/Compatibility#PHP;>compatibility page
+   for details of which versions are compatible with prior 
versions of PHP.
+HTML;
+   wfGenericError(
+   $type, $mwVersion, 'Supported PHP and HHVM versions', 
$shortText, $longText, $longHtml
+   );
+}
+
+/**
  * Display an error for the vendor/autoload.php file not being found.
  *
  * @param string $type See wfGenericError

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd97feb76228c170a547e3b98c517f8a478bd8f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-21 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

This reverts commit 87e62b845b9c8d618d0fded4a0a20cbd1869c89c.

Change-Id: Ie9543cac4a627b7f1156d68fb6a812bc0e5cfffc
---
M includes/diff/DifferenceEngine.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/289995/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 832a54c..1352aab 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -828,9 +828,8 @@
 * @return bool|string
 */
public function generateTextDiffBody( $otext, $ntext ) {
-   $self = $this;
-   $diff = function() use ( $self, $otext, $ntext ) {
-   return $self->textDiff( $otext, $ntext );
+   $diff = function() use ( $otext, $ntext ) {
+   return $this->textDiff( $otext, $ntext );
};
 
$error = function( $status ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9543cac4a627b7f1156d68fb6a812bc0e5cfffc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-05-21 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

This reverts commit 01b4001e707ea9535810af364fec2b0cba0f5735.

Change-Id: I25b47d08f69843cf8ca4638d8ac0049fd0db31ce
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/289994/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index d1f24ad..832a54c 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -856,7 +856,7 @@
 * @param string $ntext New text, must be already segmented
 * @return bool|string
 */
-   public function textDiff( $otext, $ntext ) {
+   protected function textDiff( $otext, $ntext ) {
global $wgExternalDiffEngine, $wgContLang;
 
$otext = str_replace( "\r\n", "\n", $otext );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25b47d08f69843cf8ca4638d8ac0049fd0db31ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-04-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Idcbea0522d22f460522ca915e8ec14bedc90c3f9
---
M package.json
D resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js
D resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js
3 files changed, 2 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/281861/1

diff --git a/package.json b/package.json
index 8bfb94d..d80874d 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
 "postdoc": "grunt copy:jsduck"
   },
   "devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
+"grunt": "1.0.1",
+"grunt-cli": "1.0.1",
 "grunt-banana-checker": "0.5.0",
 "grunt-contrib-copy": "1.0.0",
 "grunt-contrib-jshint": "1.0.0",
diff --git a/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js 
b/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js
deleted file mode 100644
index 456c3a0..000
--- a/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Austrian German initialisation for the jQuery UI date picker plugin. */
-jQuery(function($){
-   $.datepicker.regional['de-AT'] = {
-   closeText: 'schließen',
-   prevText: 'zurück',
-   nextText: 'Vor',
-   currentText: 'heute',
-   monthNames: ['Jänner','Februar','März','April','Mai','Juni',
-   'Juli','August','September','Oktober','November','Dezember'],
-   monthNamesShort: ['Jän','Feb','Mär','Apr','Mai','Jun',
-   'Jul','Aug','Sep','Okt','Nov','Dez'],
-   dayNames: 
['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
-   dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-   dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-   weekHeader: 'KW',
-   dateFormat: 'dd.mm.yy',
-   firstDay: 1,
-   isRTL: false,
-   showMonthAfterYear: false,
-   yearSuffix: ''};
-   $.datepicker.setDefaults($.datepicker.regional['de-AT']);
-});
diff --git a/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js 
b/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js
deleted file mode 100644
index 60cbc29..000
--- a/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Swiss Standard German initialisation for the jQuery UI date picker plugin. 
*/
-jQuery(function($){
-   $.datepicker.regional['de-CH'] = {
-   closeText: 'schliessen',
-   prevText: 'zurück',
-   nextText: 'Vor',
-   currentText: 'heute',
-   monthNames: ['Januar','Februar','März','April','Mai','Juni',
-   'Juli','August','September','Oktober','November','Dezember'],
-   monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
-   'Jul','Aug','Sep','Okt','Nov','Dez'],
-   dayNames: 
['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
-   dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-   dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
-   weekHeader: 'KW',
-   dateFormat: 'dd.mm.yy',
-   firstDay: 1,
-   isRTL: false,
-   showMonthAfterYear: false,
-   yearSuffix: ''};
-   $.datepicker.setDefaults($.datepicker.regional['de-CH']);
-});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcbea0522d22f460522ca915e8ec14bedc90c3f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-02-06 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Idfec547fbd795db5cb9809ec714027820494cfaa
---
M package.json
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/268865/1

diff --git a/package.json b/package.json
index c00dbed..872ca78 100644
--- a/package.json
+++ b/package.json
@@ -15,11 +15,11 @@
 "grunt-contrib-watch": "0.6.1",
 "grunt-jscs": "2.1.0",
 "grunt-jsonlint": "1.0.4",
-"grunt-karma": "0.11.0",
-"karma": "0.12.36",
-"karma-chrome-launcher": "0.1.12",
-"karma-firefox-launcher": "0.1.6",
-"karma-qunit": "0.1.4",
+"grunt-karma": "0.12.1",
+"karma": "0.13.19",
+"karma-chrome-launcher": "0.2.2",
+"karma-firefox-launcher": "0.1.7",
+"karma-qunit": "0.1.5",
 "qunitjs": "1.18.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfec547fbd795db5cb9809ec714027820494cfaa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-02-06 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: I87f962e98a4b6ae8db8a37e3695cbdbbf9003924
---
M resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/268890/1

diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js 
b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js
index 59f1d50..847cb4b 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js
@@ -66,6 +66,8 @@
}
 
/* Setup */
+   
+   /* global OO.ui.mixin.PendingElement */
 
OO.inheritClass( CategorySelector, OO.ui.CapsuleMultiSelectWidget );
OO.mixinClass( CategorySelector, OO.ui.mixin.PendingElement );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87f962e98a4b6ae8db8a37e3695cbdbbf9003924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-02-06 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Ie99127e03495f48bb88979c1b39d9872e3e0edf2
---
M package.json
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/268864/1

diff --git a/package.json b/package.json
index c00dbed..872ca78 100644
--- a/package.json
+++ b/package.json
@@ -15,11 +15,11 @@
 "grunt-contrib-watch": "0.6.1",
 "grunt-jscs": "2.1.0",
 "grunt-jsonlint": "1.0.4",
-"grunt-karma": "0.11.0",
-"karma": "0.12.36",
-"karma-chrome-launcher": "0.1.12",
-"karma-firefox-launcher": "0.1.6",
-"karma-qunit": "0.1.4",
+"grunt-karma": "0.12.1",
+"karma": "0.13.19",
+"karma-chrome-launcher": "0.2.2",
+"karma-firefox-launcher": "0.1.7",
+"karma-qunit": "0.1.5",
 "qunitjs": "1.18.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie99127e03495f48bb88979c1b39d9872e3e0edf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-01-28 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: If390bdfb1894744a588968cbfe1ce2479d927438
---
M includes/GlobalFunctions.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/267042/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4d0ebf6..d6e3340 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -177,7 +177,7 @@
 function wfLoadExtension( $ext, $path = null ) {
if ( !$path ) {
global $wgExtensionDirectory;
-   $path = "$wgExtensionDirectory/$ext/extension.json";
+   $path = "$wgExtensionDirectory/dirname( $ext )/extension.json";
}
ExtensionRegistry::getInstance()->queue( $path );
 }
@@ -199,7 +199,7 @@
global $wgExtensionDirectory;
$registry = ExtensionRegistry::getInstance();
foreach ( $exts as $ext ) {
-   $registry->queue( "$wgExtensionDirectory/$ext/extension.json" );
+   $registry->queue( "$wgExtensionDirectory/dirname( $ext 
)/extension.json" );
}
 }
 
@@ -214,7 +214,7 @@
 function wfLoadSkin( $skin, $path = null ) {
if ( !$path ) {
global $wgStyleDirectory;
-   $path = "$wgStyleDirectory/$skin/skin.json";
+   $path = "$wgStyleDirectory/dirname( $skin )/skin.json";
}
ExtensionRegistry::getInstance()->queue( $path );
 }
@@ -230,7 +230,7 @@
global $wgStyleDirectory;
$registry = ExtensionRegistry::getInstance();
foreach ( $skins as $skin ) {
-   $registry->queue( "$wgStyleDirectory/$skin/skin.json" );
+   $registry->queue( "$wgStyleDirectory/dirname( $skin 
)/skin.json" );
}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If390bdfb1894744a588968cbfe1ce2479d927438
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-01-24 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Ia6f425d4cfbdd3c4250325ef8c7426000a3814e0
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/266058/1

diff --git a/composer.json b/composer.json
index 94de20e..c175c77 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "~1.17.2",
"nikic/php-parser": "1.4.1",
"nmred/kafka-php": "0.1.5",
-   "phpunit/phpunit": "3.7.37",
+   "phpunit/phpunit": "3.7.37|4.8.21",
"wikimedia/avro": "1.7.7"
},
"suggest": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6f425d4cfbdd3c4250325ef8c7426000a3814e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-01-24 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Ife3adc14de61e41b2524b5660d683a90d7474ae6
---
M tests/phpunit/includes/media/IPTCTest.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/266065/1

diff --git a/tests/phpunit/includes/media/IPTCTest.php 
b/tests/phpunit/includes/media/IPTCTest.php
index 06542cf..b6306c4 100644
--- a/tests/phpunit/includes/media/IPTCTest.php
+++ b/tests/phpunit/includes/media/IPTCTest.php
@@ -46,7 +46,11 @@
public function testIPTCParseForcedUTFButInvalid() {
$iptcData = "Photoshop 
3.0\08BIM\4\4\0\0\0\0\0\x11\x1c\x02\x19\x00\x04\xC3\xC3\xC3\xB8"
. "\x1c\x01\x5A\x00\x03\x1B\x25\x47";
-   $res = IPTC::Parse( $iptcData );
+   $res = iptcparse( $iptcData );
+   $keywords = $res['2#025'];
+   foreach ( $keywords as $val ) {
+   var_dump( iconv( "UTF-8", "UTF-8//IGNORE", $val ) );
+   }
$this->assertEquals( array( 'ø' ), $res['Keywords'] );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife3adc14de61e41b2524b5660d683a90d7474ae6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-01-17 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: I53e34533e5d969ccbf91bcdd1dc3bb661dafa7fd
---
M resources/src/mediawiki/mediawiki.Uri.js
1 file changed, 16 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/264612/1

diff --git a/resources/src/mediawiki/mediawiki.Uri.js 
b/resources/src/mediawiki/mediawiki.Uri.js
index 835b423..ab49f6d 100644
--- a/resources/src/mediawiki/mediawiki.Uri.js
+++ b/resources/src/mediawiki/mediawiki.Uri.js
@@ -141,21 +141,7 @@
 * @member mw
 */
mw.UriRelative = function ( documentLocation ) {
-   var getDefaultUri = ( function () {
-   // Cache
-   var href, uri;
-
-   return function () {
-   var hrefCur = typeof documentLocation === 
'string' ? documentLocation : documentLocation();
-   if ( href === hrefCur ) {
-   return uri;
-   }
-   href = hrefCur;
-   uri = new Uri( href );
-   return uri;
-   };
-   }() );
-
+   
/**
 * Construct a new URI object. Throws error if arguments are 
illegal/impossible, or
 * otherwise don't parse.
@@ -230,6 +216,21 @@
}
}
 
+   var getDefaultUri = ( function ) {
+   // Cache
+   var href, uri;
+
+   return function () {
+   var hrefCur = typeof documentLocation === 
'string' ? documentLocation : documentLocation();
+   if ( href === hrefCur ) {
+   return uri;
+   }
+   href = hrefCur;
+   uri = new Uri( href );
+   return uri;
+   };
+   }() );
+
/**
 * Encode a value for inclusion in a url.
 *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53e34533e5d969ccbf91bcdd1dc3bb661dafa7fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)

2016-01-16 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: I7d57d27888c92eccd820b0a0925e45d7b79758e7
---
M phpcs.xml
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/264455/1

diff --git a/phpcs.xml b/phpcs.xml
index 38c7aaa..c2a3865 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -23,9 +23,6 @@

0

-   
-   0
-   
node_modules
vendor
extensions

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d57d27888c92eccd820b0a0925e45d7b79758e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Test: - change (mediawiki/core)

2015-12-26 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test:
..

Test:

Change-Id: I13a5cf50baad41c14befe21f2c816cbddb3045e6
---
M resources/src/startup.js
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/resources/src/startup.js b/resources/src/startup.js
index 1a10f83..66c0031 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -4,11 +4,11 @@
  * even the most ancient of browsers, so be very careful when editing.
  */
 /*jshint unused: false, evil: true */
-/*globals mw, RLQ: true, $VARS, $CODE, performance */
+/*globals RLQ: true, $VARS, $CODE */
 
 var mediaWikiLoadStart = ( new Date() ).getTime(),
 
-   mwPerformance = ( window.performance && performance.mark ) ? 
performance : {
+   mwPerformance = ( window.mwPerformance && mwPerformance.mark ) ? 
mwPerformance : {
mark: function () {}
};
 
@@ -66,7 +66,7 @@
 }
 
 // Conditional script injection
-( function () {
+( function ( mw ) {
if ( !isCompatible() ) {
// Undo class swapping in case of an unsupported browser.
// See OutputPage::getHeadScripts().
@@ -110,4 +110,4 @@
}
};
document.getElementsByTagName( 'head' )[ 0 ].appendChild( script );
-}() );
+}( mediaWiki ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13a5cf50baad41c14befe21f2c816cbddb3045e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] test - change (mediawiki/core)

2015-06-14 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: test
..

test

Change-Id: I8945318ab4d1e4cee5cf97c779a37547507f26f6
---
M includes/htmlform/HTMLSelectField.php
M includes/specials/SpecialBlock.php
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/218282/1

diff --git a/includes/htmlform/HTMLSelectField.php 
b/includes/htmlform/HTMLSelectField.php
index 6ba6966..4f5c4d0 100644
--- a/includes/htmlform/HTMLSelectField.php
+++ b/includes/htmlform/HTMLSelectField.php
@@ -54,6 +54,8 @@
if ( !empty( $this-mParams['disabled'] ) ) {
$disabled = true;
}
+   
+   var_dump($value);
 
return new OOUI\DropdownInputWidget( array(
'name' = $this-mName,
diff --git a/includes/specials/SpecialBlock.php 
b/includes/specials/SpecialBlock.php
index da52784..5f668d1 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -118,9 +118,9 @@
}
}
 
-   protected function getDisplayFormat() {
-   return 'ooui';
-   }
+   // protected function getDisplayFormat() {
+   //  return 'ooui';
+   // }
 
/**
 * Get the HTMLForm descriptor array for the block form

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8945318ab4d1e4cee5cf97c779a37547507f26f6
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] test - change (mediawiki/core)

2015-06-14 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: test
..

test

Change-Id: I8ddc93da1a4b4100618d8cd15ca56fe18c2ff1e5
---
M resources/lib/oojs-ui/oojs-ui.js
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/218283/1

diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index e824a8f..aec222f 100644
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -13724,7 +13724,6 @@
this.setOptions( config.options || [] );
this.$element
.addClass( 'oo-ui-radioSelectInputWidget' )
-   .empty()
.append( this.radioSelectWidget.$element );
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ddc93da1a4b4100618d8cd15ca56fe18c2ff1e5
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