[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for 315d8e223df1

2017-11-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391621 )

Change subject: Fix for 315d8e223df1
..


Fix for 315d8e223df1

Change-Id: Ib0120ee8fb00bc289aed103f07944f26dd6a0352
---
M formats/CargoDynamicTableFormat.php
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/formats/CargoDynamicTableFormat.php 
b/formats/CargoDynamicTableFormat.php
index c98106f..ad182e2 100644
--- a/formats/CargoDynamicTableFormat.php
+++ b/formats/CargoDynamicTableFormat.php
@@ -55,11 +55,13 @@
// class won't do it that way.
$dataOrderString = "data-order='" . 
json_encode( $dataTableOrderByParams ) . "'";
}
+   }
 
-   if ( array_key_exists( 'rows per page', $displayParams 
) ) {
-   // See above for why it's done this way.
-   $pageLengthString = 'data-page-length="' . 
$displayParams['rows per page'] . '"';
-   }
+   if ( array_key_exists( 'rows per page', $displayParams ) ) {
+   // See $dataOrderString above for why it's done this 
way.
+   $pageLengthString = 'data-page-length="' . 
$displayParams['rows per page'] . '"';
+   } else {
+   $pageLengthString = '';
}
 
$text = <
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fix for 315d8e223df1

2017-11-15 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391621 )

Change subject: Fix for 315d8e223df1
..

Fix for 315d8e223df1

Change-Id: Ib0120ee8fb00bc289aed103f07944f26dd6a0352
---
M formats/CargoDynamicTableFormat.php
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/21/391621/2

diff --git a/formats/CargoDynamicTableFormat.php 
b/formats/CargoDynamicTableFormat.php
index c98106f..ad182e2 100644
--- a/formats/CargoDynamicTableFormat.php
+++ b/formats/CargoDynamicTableFormat.php
@@ -55,11 +55,13 @@
// class won't do it that way.
$dataOrderString = "data-order='" . 
json_encode( $dataTableOrderByParams ) . "'";
}
+   }
 
-   if ( array_key_exists( 'rows per page', $displayParams 
) ) {
-   // See above for why it's done this way.
-   $pageLengthString = 'data-page-length="' . 
$displayParams['rows per page'] . '"';
-   }
+   if ( array_key_exists( 'rows per page', $displayParams ) ) {
+   // See $dataOrderString above for why it's done this 
way.
+   $pageLengthString = 'data-page-length="' . 
$displayParams['rows per page'] . '"';
+   } else {
+   $pageLengthString = '';
}
 
$text = <

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