[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix handling of deleted lists

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

Change subject: Fix handling of deleted lists
..


Fix handling of deleted lists

The call to getListEntryOrder aborted since it refuses to work
with deleted lists. There is not much point in showing order
information for them anyway.

Change-Id: I987d0c0154ec9790da7593522ed68781bfea6ff6
---
M src/Api/ApiQueryReadingLists.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/Api/ApiQueryReadingLists.php b/src/Api/ApiQueryReadingLists.php
index 68c9d89..0e4961a 100644
--- a/src/Api/ApiQueryReadingLists.php
+++ b/src/Api/ApiQueryReadingLists.php
@@ -180,7 +180,7 @@
 * @fixme If apps really need this, find a more performant way to get 
the data
 */
private function addExtraData( &$row, $repository, $mode ) {
-   if ( $mode !== self::MODE_PAGE ) {
+   if ( $mode !== self::MODE_PAGE && empty( $row->rl_deleted ) ) {
$row->order = $repository->getListEntryOrder( 
$row->rl_id );
if ( $row->rl_is_default ) {
$row->list_order = $repository->getListOrder();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I987d0c0154ec9790da7593522ed68781bfea6ff6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mholloway 
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...ReadingLists[master]: Fix handling of deleted lists

2017-09-26 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380695 )

Change subject: Fix handling of deleted lists
..

Fix handling of deleted lists

The call to getListEntryOrder aborted since it refuses to work
with deleted lists. There is not much point in showing order
information for them anyway.

Change-Id: I987d0c0154ec9790da7593522ed68781bfea6ff6
---
M src/Api/ApiQueryReadingLists.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/src/Api/ApiQueryReadingLists.php b/src/Api/ApiQueryReadingLists.php
index 350ca89..cd71664 100644
--- a/src/Api/ApiQueryReadingLists.php
+++ b/src/Api/ApiQueryReadingLists.php
@@ -180,7 +180,7 @@
 * @fixme If apps really need this, find a more performant way to get 
the data
 */
private function addExtraData( &$row, $repository, $mode ) {
-   if ( $mode !== self::MODE_PAGE ) {
+   if ( $mode !== self::MODE_PAGE && empty( $row->rl_deleted ) ) {
$row->order = $repository->getListEntryOrder( 
$row->rl_id );
if ( $row->rl_is_default ) {
$row->list_order = $repository->getListOrder();

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

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

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