From: Aaron Schulz Date: Thu, 28 Jun 2012 04:18:42 +0000 (-0700) Subject: Revert "Introduce a new hook that allows extensions to add to My Contributions". X-Git-Tag: 1.31.0-rc.0~23213 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=604148f1be6529f1eb0d74d45505dcb266690a41;p=lhc%2Fweb%2Fwiklou.git Revert "Introduce a new hook that allows extensions to add to My Contributions". In formatRow(): the hook change breaks FlaggedRevs, and also $ret may not always be defined. The patch could use some extra work. This reverts commit 0944502d4cc15356e42d5773e1478cb7ce5af30b This reverts commit d0131e8a1914e76f220ade2cd723dc52bdb06ec9. Change-Id: I05d980e19d99e1c461199705b04de9e307daa907 --- diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20 index 5900e614a1..a838a37889 100644 --- a/RELEASE-NOTES-1.20 +++ b/RELEASE-NOTES-1.20 @@ -74,7 +74,6 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki. * Added new function getDomain to AuthPlugin for getting a user's domain * (bug 23427) New magic word {{PAGEID}} which gives the current page ID. Will be null on previewing a page being created. -* Added ContribsPager::reallyDoQuery hook allowing extensions to data to MyContribs * (bug 37627) UserNotLoggedIn() exception to show a generic error page whenever a user is not logged in. diff --git a/docs/hooks.txt b/docs/hooks.txt index b7e9adb5f3..147e524242 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -701,13 +701,6 @@ $user: user (object) whose email is being confirmed &$pager: Pager object for contributions &$queryInfo: The query for the contribs Pager -'ContribsPager::reallyDoQuery': Called before really executing the query for My Contributions -&$data: an array of results of all contribs queries -$pager: The ContribsPager object hooked into -$offset: Index offset, inclusive -$limit: Exact query limit -$descending: Query direction, false for ascending, true for descending - 'ContributionsLineEnding': Called before a contributions HTML line is finished $page: SpecialPage object for contributions $ret: the HTML line diff --git a/includes/Pager.php b/includes/Pager.php index 9d1f9fcb7e..bcd6d14cff 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -194,7 +194,6 @@ abstract class IndexPager extends ContextSource implements Pager { $queryLimit, $descending ); - $this->extractResultInfo( $this->mOffset, $queryLimit, $this->mResult ); $this->mQueryDone = true; @@ -304,21 +303,7 @@ abstract class IndexPager extends ContextSource implements Pager { * @param $descending Boolean: query direction, false for ascending, true for descending * @return ResultWrapper */ - public function reallyDoQuery( $offset, $limit, $descending ) { - list( $tables, $fields, $conds, $fname, $options, $join_conds ) = $this->buildQueryInfo( $offset, $limit, $descending ); - $result = $this->mDb->select( $tables, $fields, $conds, $fname, $options, $join_conds ); - return new ResultWrapper( $this->mDb, $result ); - } - - /** - * Build variables to use by the database wrapper. - * - * @param $offset String: index offset, inclusive - * @param $limit Integer: exact query limit - * @param $descending Boolean: query direction, false for ascending, true for descending - * @return array - */ - protected function buildQueryInfo( $offset, $limit, $descending ) { + function reallyDoQuery( $offset, $limit, $descending ) { $fname = __METHOD__ . ' (' . $this->getSqlComment() . ')'; $info = $this->getQueryInfo(); $tables = $info['tables']; @@ -342,7 +327,8 @@ abstract class IndexPager extends ContextSource implements Pager { $conds[] = $this->mIndexField . $operator . $this->mDb->addQuotes( $offset ); } $options['LIMIT'] = intval( $limit ); - return array( $tables, $fields, $conds, $fname, $options, $join_conds ); + $res = $this->mDb->select( $tables, $fields, $conds, $fname, $options, $join_conds ); + return new ResultWrapper( $this->mDb, $res ); } /** diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php index 3e8c40b5c8..eacebcfc69 100644 --- a/includes/db/DatabaseUtility.php +++ b/includes/db/DatabaseUtility.php @@ -242,12 +242,7 @@ class FakeResultWrapper extends ResultWrapper { $this->currentRow = false; } $this->pos++; - - if ( is_object( $this->currentRow ) ) { - return get_object_vars( $this->currentRow ); - } else { - return $this->currentRow; - } + return $this->currentRow; } function seek( $row ) { diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 239ab3315b..94650371e2 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -594,66 +594,6 @@ class ContribsPager extends ReverseChronologicalPager { return $query; } - /** - * This method basically executes the exact same code as the parent class, though with - * a hook added, to allow extentions to add additional queries. - * - * @param $offset String: index offset, inclusive - * @param $limit Integer: exact query limit - * @param $descending Boolean: query direction, false for ascending, true for descending - * @return ResultWrapper - */ - function reallyDoQuery( $offset, $limit, $descending ) { - list( $tables, $fields, $conds, $fname, $options, $join_conds ) = $this->buildQueryInfo( $offset, $limit, $descending ); - $pager = $this; - - /* - * This hook will allow extensions to add in additional queries, so they can get their data - * in My Contributions as well. Extensions should append their results to the $data array. - * - * Extension queries have to implement the navbar requirement as well. They should - * - have a column aliased as $pager->getIndexField() - * - have LIMIT set - * - have a WHERE-clause that compares the $pager->getIndexField()-equivalent column to the offset - * - have the ORDER BY specified based upon the details provided by the navbar - * - * See includes/Pager.php buildQueryInfo() method on how to build LIMIT, WHERE & ORDER BY - * - * &$data: an array of results of all contribs queries - * $pager: the ContribsPager object hooked into - * $offset: see phpdoc above - * $limit: see phpdoc above - * $descending: see phpdoc above - */ - $data = array( $this->mDb->select( $tables, $fields, $conds, $fname, $options, $join_conds ) ); - wfRunHooks( 'ContribsPager::reallyDoQuery', array( &$data, $pager, $offset, $limit, $descending ) ); - - $result = array(); - - // loop all results and collect them in an array - foreach ( $data as $j => $query ) { - foreach ( $query as $i => $row ) { - // use index column as key, allowing us to easily sort in PHP - $result[$row->{$this->getIndexField()} . "-$i"] = $row; - } - } - - // sort results - if ( $descending ) { - ksort( $result ); - } else { - krsort( $result ); - } - - // enforce limit - $result = array_slice( $result, 0, $limit ); - - // get rid of array keys - $result = array_values( $result ); - - return new FakeResultWrapper( $result ); - } - function getQueryInfo() { list( $tables, $index, $userCond, $join_cond ) = $this->getUserCond(); @@ -762,7 +702,7 @@ class ContribsPager extends ReverseChronologicalPager { $this->mResult->rewind(); $revIds = array(); foreach ( $this->mResult as $row ) { - if( isset( $row->rev_parent_id ) && $row->rev_parent_id ) { + if( $row->rev_parent_id ) { $revIds[] = $row->rev_parent_id; } } @@ -774,13 +714,11 @@ class ContribsPager extends ReverseChronologicalPager { $batch = new LinkBatch(); # Give some pointers to make (last) links foreach ( $this->mResult as $row ) { - if ( isset( $row->rev_id ) ) { - if ( $this->contribs === 'newbie' ) { // multiple users - $batch->add( NS_USER, $row->user_name ); - $batch->add( NS_USER_TALK, $row->user_name ); - } - $batch->add( $row->page_namespace, $row->page_title ); + if ( $this->contribs === 'newbie' ) { // multiple users + $batch->add( NS_USER, $row->user_name ); + $batch->add( NS_USER_TALK, $row->user_name ); } + $batch->add( $row->page_namespace, $row->page_title ); } $batch->execute(); $this->mResult->seek( 0 ); @@ -815,125 +753,123 @@ class ContribsPager extends ReverseChronologicalPager { function formatRow( $row ) { wfProfileIn( __METHOD__ ); - if ( isset( $row->rev_id ) ) { - $rev = new Revision( $row ); - $classes = array(); + $rev = new Revision( $row ); + $classes = array(); - $page = Title::newFromRow( $row ); - $link = Linker::link( - $page, - htmlspecialchars( $page->getPrefixedText() ), - array(), - $page->isRedirect() ? array( 'redirect' => 'no' ) : array() - ); - # Mark current revisions - $topmarktext = ''; - if ( $row->rev_id == $row->page_latest ) { - $topmarktext .= '' . $this->messages['uctop'] . ''; - # Add rollback link - if ( !$row->page_is_new && $page->quickUserCan( 'rollback' ) - && $page->quickUserCan( 'edit' ) ) - { - $this->preventClickjacking(); - $topmarktext .= ' ' . Linker::generateRollback( $rev ); - } - } - $user = $this->getUser(); - # Is there a visible previous revision? - if ( $rev->userCan( Revision::DELETED_TEXT, $user ) && $rev->getParentId() !== 0 ) { - $difftext = Linker::linkKnown( - $page, - $this->messages['diff'], - array(), - array( - 'diff' => 'prev', - 'oldid' => $row->rev_id - ) - ); - } else { - $difftext = $this->messages['diff']; + $page = Title::newFromRow( $row ); + $link = Linker::link( + $page, + htmlspecialchars( $page->getPrefixedText() ), + array(), + $page->isRedirect() ? array( 'redirect' => 'no' ) : array() + ); + # Mark current revisions + $topmarktext = ''; + if ( $row->rev_id == $row->page_latest ) { + $topmarktext .= '' . $this->messages['uctop'] . ''; + # Add rollback link + if ( !$row->page_is_new && $page->quickUserCan( 'rollback' ) + && $page->quickUserCan( 'edit' ) ) + { + $this->preventClickjacking(); + $topmarktext .= ' ' . Linker::generateRollback( $rev ); } - $histlink = Linker::linkKnown( + } + $user = $this->getUser(); + # Is there a visible previous revision? + if ( $rev->userCan( Revision::DELETED_TEXT, $user ) && $rev->getParentId() !== 0 ) { + $difftext = Linker::linkKnown( $page, - $this->messages['hist'], + $this->messages['diff'], array(), - array( 'action' => 'history' ) + array( + 'diff' => 'prev', + 'oldid' => $row->rev_id + ) ); + } else { + $difftext = $this->messages['diff']; + } + $histlink = Linker::linkKnown( + $page, + $this->messages['hist'], + array(), + array( 'action' => 'history' ) + ); - if ( $row->rev_parent_id === null ) { - // For some reason rev_parent_id isn't populated for this row. - // Its rumoured this is true on wikipedia for some revisions (bug 34922). - // Next best thing is to have the total number of bytes. - $chardiff = ' . . ' . Linker::formatRevisionSize( $row->rev_len ) . ' . . '; - } else { - $parentLen = isset( $this->mParentLens[$row->rev_parent_id] ) ? $this->mParentLens[$row->rev_parent_id] : 0; - $chardiff = ' . . ' . ChangesList::showCharacterDifference( - $parentLen, $row->rev_len ) . ' . . '; - } - - $lang = $this->getLanguage(); - $comment = $lang->getDirMark() . Linker::revComment( $rev, false, true ); - $date = $lang->userTimeAndDate( $row->rev_timestamp, $user ); - if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) { - $d = Linker::linkKnown( - $page, - htmlspecialchars( $date ), - array(), - array( 'oldid' => intval( $row->rev_id ) ) - ); - } else { - $d = htmlspecialchars( $date ); - } - if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) { - $d = '' . $d . ''; - } - - # Show user names for /newbies as there may be different users. - # Note that we already excluded rows with hidden user names. - if ( $this->contribs == 'newbie' ) { - $userlink = ' . . ' . Linker::userLink( $rev->getUser(), $rev->getUserText() ); - $userlink .= ' ' . $this->msg( 'parentheses' )->rawParams( - Linker::userTalkLink( $rev->getUser(), $rev->getUserText() ) )->escaped() . ' '; - } else { - $userlink = ''; - } + if ( $row->rev_parent_id === null ) { + // For some reason rev_parent_id isn't populated for this row. + // Its rumoured this is true on wikipedia for some revisions (bug 34922). + // Next best thing is to have the total number of bytes. + $chardiff = ' . . ' . Linker::formatRevisionSize( $row->rev_len ) . ' . . '; + } else { + $parentLen = isset( $this->mParentLens[$row->rev_parent_id] ) ? $this->mParentLens[$row->rev_parent_id] : 0; + $chardiff = ' . . ' . ChangesList::showCharacterDifference( + $parentLen, $row->rev_len ) . ' . . '; + } - if ( $rev->getParentId() === 0 ) { - $nflag = ChangesList::flag( 'newpage' ); - } else { - $nflag = ''; - } + $lang = $this->getLanguage(); + $comment = $lang->getDirMark() . Linker::revComment( $rev, false, true ); + $date = $lang->userTimeAndDate( $row->rev_timestamp, $user ); + if ( $rev->userCan( Revision::DELETED_TEXT, $user ) ) { + $d = Linker::linkKnown( + $page, + htmlspecialchars( $date ), + array(), + array( 'oldid' => intval( $row->rev_id ) ) + ); + } else { + $d = htmlspecialchars( $date ); + } + if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) { + $d = '' . $d . ''; + } - if ( $rev->isMinor() ) { - $mflag = ChangesList::flag( 'minor' ); - } else { - $mflag = ''; - } + # Show user names for /newbies as there may be different users. + # Note that we already excluded rows with hidden user names. + if ( $this->contribs == 'newbie' ) { + $userlink = ' . . ' . Linker::userLink( $rev->getUser(), $rev->getUserText() ); + $userlink .= ' ' . $this->msg( 'parentheses' )->rawParams( + Linker::userTalkLink( $rev->getUser(), $rev->getUserText() ) )->escaped() . ' '; + } else { + $userlink = ''; + } - $del = Linker::getRevDeleteLink( $user, $rev, $page ); - if ( $del !== '' ) { - $del .= ' '; - } + if ( $rev->getParentId() === 0 ) { + $nflag = ChangesList::flag( 'newpage' ); + } else { + $nflag = ''; + } - $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )->escaped(); - $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}"; + if ( $rev->isMinor() ) { + $mflag = ChangesList::flag( 'minor' ); + } else { + $mflag = ''; + } - # Denote if username is redacted for this edit - if ( $rev->isDeleted( Revision::DELETED_USER ) ) { - $ret .= " " . $this->msg( 'rev-deleted-user-contribs' )->escaped() . ""; - } + $del = Linker::getRevDeleteLink( $user, $rev, $page ); + if ( $del !== '' ) { + $del .= ' '; + } - # Tags, if any. - list( $tagSummary, $newClasses ) = ChangeTags::formatSummaryRow( $row->ts_tags, 'contributions' ); - $classes = array_merge( $classes, $newClasses ); - $ret .= " $tagSummary"; + $diffHistLinks = $this->msg( 'parentheses' )->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )->escaped(); + $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}"; - $classes = implode( ' ', $classes ); - $ret = "
  • $ret
    • \n"; + # Denote if username is redacted for this edit + if ( $rev->isDeleted( Revision::DELETED_USER ) ) { + $ret .= " " . $this->msg( 'rev-deleted-user-contribs' )->escaped() . ""; } + # Tags, if any. + list( $tagSummary, $newClasses ) = ChangeTags::formatSummaryRow( $row->ts_tags, 'contributions' ); + $classes = array_merge( $classes, $newClasses ); + $ret .= " $tagSummary"; + // Let extensions add data wfRunHooks( 'ContributionsLineEnding', array( &$this, &$ret, $row ) ); + + $classes = implode( ' ', $classes ); + $ret = "
  • $ret
    • \n"; wfProfileOut( __METHOD__ ); return $ret; }