Matthias Mullie has uploaded a new change for review.

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

Change subject: Fix fatal in FlowPopulateLinksTables.php
......................................................................

Fix fatal in FlowPopulateLinksTables.php

$row is an StdClass object, but is accessed as array, prompting a fatal.
Also, only tree_rev_id column is requested, so tree_parent_id will never
even exist.
I've moved the tree_parent_id-based check into the query.

Change-Id: If4fb81543a155af2e8b2b9bf13a453fd011d0472
---
M maintenance/FlowPopulateLinksTables.php
1 file changed, 4 insertions(+), 5 deletions(-)


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

diff --git a/maintenance/FlowPopulateLinksTables.php 
b/maintenance/FlowPopulateLinksTables.php
index 56dfaa5..13dea52 100644
--- a/maintenance/FlowPopulateLinksTables.php
+++ b/maintenance/FlowPopulateLinksTables.php
@@ -76,7 +76,10 @@
                        $res = $dbr->select(
                                array( 'flow_tree_revision' ),
                                array( 'tree_rev_id' ),
-                               array( 'tree_rev_id > ' . $dbr->addQuotes( $id 
) ),
+                               array(
+                                       'tree_rev_id > ' . $dbr->addQuotes( $id 
),
+                                       'tree_parent_id IS NOT NULL',
+                               ),
                                __METHOD__,
                                array( 'ORDER BY' => 'tree_rev_id ASC', 'LIMIT' 
=> $this->mBatchSize )
                        );
@@ -84,10 +87,6 @@
                                throw new \MWException( 'SQL error in 
maintenance script ' . __METHOD__ );
                        }
                        foreach ( $res as $row ) {
-                               if ( !$row['tree_parent_id'] ) {
-                                       // topic title, does not contain html 
or links
-                                       continue;
-                               }
                                $count++;
                                $id = $row->tree_rev_id;
                                $uuid = UUID::create( $id );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4fb81543a155af2e8b2b9bf13a453fd011d0472
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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

Reply via email to