From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/ChangeTags.php | 147 +++++++++++++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 52 deletions(-) (limited to 'includes/ChangeTags.php') diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php index 3fc27f9a..94b7b7a9 100644 --- a/includes/ChangeTags.php +++ b/includes/ChangeTags.php @@ -21,18 +21,15 @@ */ class ChangeTags { - /** * Creates HTML for the given tags * * @param string $tags Comma-separated list of tags * @param string $page A label for the type of action which is being displayed, - * for example: 'history', 'contributions' or 'newpages' - * - * @return Array with two items: (html, classes) - * - html: String: HTML for displaying the tags (empty string when param $tags is empty) - * - classes: Array of strings: CSS classes used in the generated html, one class for each tag - * + * for example: 'history', 'contributions' or 'newpages' + * @return array Array with two items: (html, classes) + * - html: String: HTML for displaying the tags (empty string when param $tags is empty) + * - classes: Array of strings: CSS classes used in the generated html, one class for each tag */ public static function formatSummaryRow( $tags, $page ) { global $wgLang; @@ -66,10 +63,10 @@ class ChangeTags { /** * Get a short description for a tag * - * @param string $tag tag + * @param string $tag Tag * - * @return String: Short description of the tag from "mediawiki:tag-$tag" if this message exists, - * html-escaped version of $tag otherwise + * @return string Short description of the tag from "mediawiki:tag-$tag" if this message exists, + * html-escaped version of $tag otherwise */ public static function tagDescription( $tag ) { $msg = wfMessage( "tag-$tag" ); @@ -80,17 +77,19 @@ class ChangeTags { * Add tags to a change given its rc_id, rev_id and/or log_id * * @param string|array $tags Tags to add to the change - * @param $rc_id int: rc_id of the change to add the tags to - * @param $rev_id int: rev_id of the change to add the tags to - * @param $log_id int: log_id of the change to add the tags to - * @param string $params params to put in the ct_params field of table 'change_tag' + * @param int|null $rc_id The rc_id of the change to add the tags to + * @param int|null $rev_id The rev_id of the change to add the tags to + * @param int|null $log_id The log_id of the change to add the tags to + * @param string $params Params to put in the ct_params field of table 'change_tag' * * @throws MWException - * @return bool: false if no changes are made, otherwise true + * @return bool False if no changes are made, otherwise true * - * @exception MWException when $rc_id, $rev_id and $log_id are all null + * @exception MWException When $rc_id, $rev_id and $log_id are all null */ - public static function addTags( $tags, $rc_id = null, $rev_id = null, $log_id = null, $params = null ) { + public static function addTags( $tags, $rc_id = null, $rev_id = null, + $log_id = null, $params = null + ) { if ( !is_array( $tags ) ) { $tags = array( $tags ); } @@ -102,26 +101,52 @@ class ChangeTags { 'specified when adding a tag to a change!' ); } - $dbr = wfGetDB( DB_SLAVE ); + $dbw = wfGetDB( DB_MASTER ); // Might as well look for rcids and so on. if ( !$rc_id ) { - $dbr = wfGetDB( DB_MASTER ); // Info might be out of date, somewhat fractionally, on slave. + // Info might be out of date, somewhat fractionally, on slave. if ( $log_id ) { - $rc_id = $dbr->selectField( 'recentchanges', 'rc_id', array( 'rc_logid' => $log_id ), __METHOD__ ); + $rc_id = $dbw->selectField( + 'recentchanges', + 'rc_id', + array( 'rc_logid' => $log_id ), + __METHOD__ + ); } elseif ( $rev_id ) { - $rc_id = $dbr->selectField( 'recentchanges', 'rc_id', array( 'rc_this_oldid' => $rev_id ), __METHOD__ ); + $rc_id = $dbw->selectField( + 'recentchanges', + 'rc_id', + array( 'rc_this_oldid' => $rev_id ), + __METHOD__ + ); } } elseif ( !$log_id && !$rev_id ) { - $dbr = wfGetDB( DB_MASTER ); // Info might be out of date, somewhat fractionally, on slave. - $log_id = $dbr->selectField( 'recentchanges', 'rc_logid', array( 'rc_id' => $rc_id ), __METHOD__ ); - $rev_id = $dbr->selectField( 'recentchanges', 'rc_this_oldid', array( 'rc_id' => $rc_id ), __METHOD__ ); + // Info might be out of date, somewhat fractionally, on slave. + $log_id = $dbw->selectField( + 'recentchanges', + 'rc_logid', + array( 'rc_id' => $rc_id ), + __METHOD__ + ); + $rev_id = $dbw->selectField( + 'recentchanges', + 'rc_this_oldid', + array( 'rc_id' => $rc_id ), + __METHOD__ + ); } - $tsConds = array_filter( array( 'ts_rc_id' => $rc_id, 'ts_rev_id' => $rev_id, 'ts_log_id' => $log_id ) ); + $tsConds = array_filter( array( + 'ts_rc_id' => $rc_id, + 'ts_rev_id' => $rev_id, + 'ts_log_id' => $log_id ) + ); - ## Update the summary row. - $prevTags = $dbr->selectField( 'tag_summary', 'ts_tags', $tsConds, __METHOD__ ); + // Update the summary row. + // $prevTags can be out of date on slaves, especially when addTags is called consecutively, + // causing loss of tags added recently in tag_summary table. + $prevTags = $dbw->selectField( 'tag_summary', 'ts_tags', $tsConds, __METHOD__ ); $prevTags = $prevTags ? $prevTags : ''; $prevTags = array_filter( explode( ',', $prevTags ) ); $newTags = array_unique( array_merge( $prevTags, $tags ) ); @@ -133,7 +158,6 @@ class ChangeTags { return false; } - $dbw = wfGetDB( DB_MASTER ); $dbw->replace( 'tag_summary', array( 'ts_rev_id', 'ts_rc_id', 'ts_log_id' ), @@ -167,9 +191,9 @@ class ChangeTags { * * @param string|array $tables Table names, see DatabaseBase::select * @param string|array $fields Fields used in query, see DatabaseBase::select - * @param string|array $conds conditions used in query, see DatabaseBase::select - * @param $join_conds Array: join conditions, see DatabaseBase::select - * @param array $options options, see Database::select + * @param string|array $conds Conditions used in query, see DatabaseBase::select + * @param array $join_conds Join conditions, see DatabaseBase::select + * @param array $options Options, see Database::select * @param bool|string $filter_tag Tag to select on * * @throws MWException When unable to determine appropriate JOIN condition for tagging @@ -184,29 +208,27 @@ class ChangeTags { // Figure out which conditions can be done. if ( in_array( 'recentchanges', $tables ) ) { - $join_cond = 'rc_id'; + $join_cond = 'ct_rc_id=rc_id'; } elseif ( in_array( 'logging', $tables ) ) { - $join_cond = 'log_id'; + $join_cond = 'ct_log_id=log_id'; } elseif ( in_array( 'revision', $tables ) ) { - $join_cond = 'rev_id'; + $join_cond = 'ct_rev_id=rev_id'; + } elseif ( in_array( 'archive', $tables ) ) { + $join_cond = 'ct_rev_id=ar_rev_id'; } else { throw new MWException( 'Unable to determine appropriate JOIN condition for tagging.' ); } - // JOIN on tag_summary - $tables[] = 'tag_summary'; - $join_conds['tag_summary'] = array( 'LEFT JOIN', "ts_$join_cond=$join_cond" ); - $fields[] = 'ts_tags'; + $fields['ts_tags'] = wfGetDB( DB_SLAVE )->buildGroupConcatField( + ',', 'change_tag', 'ct_tag', $join_cond + ); if ( $wgUseTagFilter && $filter_tag ) { // Somebody wants to filter on a tag. // Add an INNER JOIN on change_tag - // FORCE INDEX -- change_tags will almost ALWAYS be the correct query plan. - $options['USE INDEX'] = array( 'change_tag' => 'change_tag_tag_id' ); - unset( $options['FORCE INDEX'] ); $tables[] = 'change_tag'; - $join_conds['change_tag'] = array( 'INNER JOIN', "ct_$join_cond=$join_cond" ); + $join_conds['change_tag'] = array( 'INNER JOIN', $join_cond ); $conds['ct_tag'] = $filter_tag; } } @@ -214,34 +236,55 @@ class ChangeTags { /** * Build a text box to select a change tag * - * @param string $selected tag to select by default - * @param $fullForm Boolean: + * @param string $selected Tag to select by default + * @param bool $fullForm * - if false, then it returns an array of (label, form). * - if true, it returns an entire form around the selector. - * @param $title Title object to send the form to. + * @param Title $title Title object to send the form to. * Used when, and only when $fullForm is true. - * @return String or array: + * @return string|array * - if $fullForm is false: Array with * - if $fullForm is true: String, html fragment */ - public static function buildTagFilterSelector( $selected = '', $fullForm = false, Title $title = null ) { + public static function buildTagFilterSelector( $selected = '', + $fullForm = false, Title $title = null + ) { global $wgUseTagFilter; if ( !$wgUseTagFilter || !count( self::listDefinedTags() ) ) { return $fullForm ? '' : array(); } - $data = array( Html::rawElement( 'label', array( 'for' => 'tagfilter' ), wfMessage( 'tag-filter' )->parse() ), - Xml::input( 'tagfilter', 20, $selected, array( 'class' => 'mw-tagfilter-input' ) ) ); + $data = array( + Html::rawElement( + 'label', + array( 'for' => 'tagfilter' ), + wfMessage( 'tag-filter' )->parse() + ), + Xml::input( + 'tagfilter', + 20, + $selected, + array( 'class' => 'mw-tagfilter-input', 'id' => 'tagfilter' ) + ) + ); if ( !$fullForm ) { return $data; } $html = implode( ' ', $data ); - $html .= "\n" . Xml::element( 'input', array( 'type' => 'submit', 'value' => wfMessage( 'tag-filter-submit' )->text() ) ); + $html .= "\n" . + Xml::element( + 'input', + array( 'type' => 'submit', 'value' => wfMessage( 'tag-filter-submit' )->text() ) + ); $html .= "\n" . Html::hidden( 'title', $title->getPrefixedText() ); - $html = Xml::tags( 'form', array( 'action' => $title->getLocalURL(), 'class' => 'mw-tagfilter-form', 'method' => 'get' ), $html ); + $html = Xml::tags( + 'form', + array( 'action' => $title->getLocalURL(), 'class' => 'mw-tagfilter-form', 'method' => 'get' ), + $html + ); return $html; } @@ -253,7 +296,7 @@ class ChangeTags { * * Tries memcached first. * - * @return Array of strings: tags + * @return string[] Array of strings: tags */ public static function listDefinedTags() { // Caching... -- cgit v1.2.2