| Index: branches/wmf/1.17wmf1/extensions/FlaggedRevs/FlaggedRevs.hooks.php |
| — | — | @@ -2145,10 +2145,13 @@ |
| 2146 | 2146 | return true; |
| 2147 | 2147 | } |
| 2148 | 2148 | |
| 2149 | | - public static function gnsmQueryModifier( array $params, array &$joins, array &$conditions ) { |
| 2150 | | - $filterSet = array( GoogleNewsSitemap::OPT_ONLY, GoogleNewsSitemap::OPT_EXCLUDE ); |
| | 2149 | + public static function gnsmQueryModifier( array $params, array &$joins, array &$conditions, array &$tables ) { |
| | 2150 | + $filterSet = array( GoogleNewsSitemap::OPT_ONLY => true, |
| | 2151 | + GoogleNewsSitemap::OPT_EXCLUDE => true |
| | 2152 | + ); |
| 2151 | 2153 | # Either involves the same JOIN here... |
| 2152 | 2154 | if ( isset( $filterSet[ $params['stable'] ] ) || isset( $filterSet[ $params['quality'] ] ) ) { |
| | 2155 | + $tables[] = 'flaggedpages'; |
| 2153 | 2156 | $joins['flaggedpages'] = array( 'LEFT JOIN', 'page_id = fp_page_id' ); |
| 2154 | 2157 | } |
| 2155 | 2158 | |
| — | — | @@ -2166,7 +2169,7 @@ |
| 2167 | 2170 | $conditions[] = 'fp_quality >= 1'; |
| 2168 | 2171 | break; |
| 2169 | 2172 | case GoogleNewsSitemap::OPT_EXCLUDE: |
| 2170 | | - $conditions['fp_quality'] = 0; |
| | 2173 | + $conditions[] = 'fp_quality = 0 OR fp_quality IS NULL'; |
| 2171 | 2174 | break; |
| 2172 | 2175 | } |
| 2173 | 2176 | |
| Property changes on: branches/wmf/1.17wmf1/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2174 | 2177 | Merged /trunk/extensions/FlaggedRevs:r87236 |
| Index: branches/wmf/1.17wmf1/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php |
| — | — | @@ -270,12 +270,13 @@ |
| 271 | 271 | // so this can't ever work with uncategorized articles |
| 272 | 272 | $fields = array( 'page_namespace', 'page_title', 'page_id', 'c1.cl_timestamp' ); |
| 273 | 273 | $conditions = array(); |
| | 274 | + $joins = array(); |
| 274 | 275 | |
| 275 | 276 | if ( $params['namespace'] !== false ) { |
| 276 | 277 | $conditions['page_namespace'] = $params['namespace']; |
| 277 | 278 | } |
| 278 | 279 | |
| 279 | | - wfRunHooks('GoogleNewsSitemap::Query', array($params, &$joins, &$conditions)); |
| | 280 | + wfRunHooks('GoogleNewsSitemap::Query', array($params, &$joins, &$conditions, &$tables)); |
| 280 | 281 | |
| 281 | 282 | switch ( $params['redirects'] ) { |
| 282 | 283 | case self::OPT_ONLY: |
| — | — | @@ -307,7 +308,6 @@ |
| 308 | 309 | $currentTableNumber = 1; |
| 309 | 310 | $categorylinks = $dbr->tableName( 'categorylinks' ); |
| 310 | 311 | |
| 311 | | - $joins = array(); |
| 312 | 312 | for ( $i = 0; $i < $params['catCount']; $i++ ) { |
| 313 | 313 | $joins["$categorylinks AS c$currentTableNumber"] = array( 'INNER JOIN', |
| 314 | 314 | array( "page_id = c{$currentTableNumber}.cl_from", |
| Property changes on: branches/wmf/1.17wmf1/extensions/GoogleNewsSitemap |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 315 | 315 | Merged /branches/sqlite/extensions/GoogleNewsSitemap:r58211-58321 |
| 316 | 316 | Merged /trunk/phase3/extensions/GoogleNewsSitemap:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590 |
| 317 | 317 | Merged /branches/new-installer/phase3/extensions/GoogleNewsSitemap:r43664-66004 |
| 318 | 318 | Merged /branches/wmf-deployment/extensions/GoogleNewsSitemap:r60970 |
| 319 | 319 | Merged /branches/REL1_15/phase3/extensions/GoogleNewsSitemap:r51646 |
| 320 | 320 | Merged /branches/wmf/1.16wmf4/extensions/GoogleNewsSitemap:r67177,69199,76243,77266 |
| 321 | 321 | Merged /trunk/extensions/GoogleNewsSitemap:r87236 |