| Index: trunk/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php |
| — | — | @@ -86,17 +86,17 @@ |
| 87 | 87 | |
| 88 | 88 | if ( 'sitemap' == $this->params['feed'] ) { |
| 89 | 89 | $feed = new SitemapFeed( |
| 90 | | - $wgServer . $wgScriptPath, |
| 91 | | - date( DATE_ATOM ) |
| | 90 | + $wgServer . $wgScriptPath, |
| | 91 | + date( DATE_ATOM ) |
| 92 | 92 | ); |
| 93 | 93 | } else { |
| 94 | 94 | // FIXME: These should be configurable at some point |
| 95 | 95 | $feed = new $wgFeedClasses[ $this->params['feed'] ]( |
| 96 | | - $wgSitename, |
| 97 | | - $wgSitename . ' ' . $this->params['feed'] . ' feed', |
| 98 | | - $wgServer . $wgScriptPath, |
| 99 | | - date( DATE_ATOM ), |
| 100 | | - $wgSitename |
| | 96 | + $wgSitename, |
| | 97 | + $wgSitename . ' ' . $this->params['feed'] . ' feed', |
| | 98 | + $wgServer . $wgScriptPath, |
| | 99 | + date( DATE_ATOM ), |
| | 100 | + $wgSitename |
| 101 | 101 | ); |
| 102 | 102 | } |
| 103 | 103 | |
| — | — | @@ -147,14 +147,17 @@ |
| 148 | 148 | $talkpage = $title->getTalkPage(); |
| 149 | 149 | $comments = $talkpage->getFullURL(); |
| 150 | 150 | } |
| 151 | | - $titleText = ( true === $this->params['nameSpace'] ) ? $title->getPrefixedText() : $title->getText(); |
| | 151 | + $titleText = ( true === $this->params['nameSpace'] ) |
| | 152 | + ? $title->getPrefixedText() |
| | 153 | + : $title->getText(); |
| 152 | 154 | $feedItem = new FeedItem( |
| 153 | | - $titleText, |
| 154 | | - $this->feedItemDesc( $row ), |
| 155 | | - $title->getFullURL(), |
| 156 | | - $this->Date, |
| 157 | | - $this->feedItemAuthor( $row ), |
| 158 | | - $comments ); |
| | 155 | + $titleText, |
| | 156 | + $this->feedItemDesc( $row ), |
| | 157 | + $title->getFullURL(), |
| | 158 | + $this->Date, |
| | 159 | + $this->feedItemAuthor( $row ), |
| | 160 | + $comments |
| | 161 | + ); |
| 159 | 162 | } |
| 160 | 163 | $feed->outItem( $feedItem ); |
| 161 | 164 | } |
| — | — | @@ -168,7 +171,8 @@ |
| 169 | 172 | **/ |
| 170 | 173 | public function dpl_buildSQL() { |
| 171 | 174 | $dbr = wfGetDB( DB_SLAVE ); |
| 172 | | - $sqlSelectFrom = 'SELECT page_namespace, page_title, page_id, c1.cl_timestamp FROM ' . $dbr->tableName( 'page' ); |
| | 175 | + $sqlSelectFrom = 'SELECT page_namespace, page_title, page_id, c1.cl_timestamp FROM ' |
| | 176 | + . $dbr->tableName( 'page' ); |
| 173 | 177 | |
| 174 | 178 | if ( $this->params['nameSpace'] ) { |
| 175 | 179 | $sqlWhere = ' WHERE page_namespace=' . $this->params['iNameSpace'] . ' '; |
| — | — | @@ -434,7 +438,8 @@ |
| 435 | 439 | $this->params['notCatCount'] = count( $this->notCategories ); |
| 436 | 440 | $totalCatCount = $this->params['catCount'] + $this->params['notCatCount']; |
| 437 | 441 | |
| 438 | | - if ( ( $this->params['catCount'] < 1 && false == $this->params['nameSpace'] ) || ( $totalCatCount < $this->wgDPlminCategories ) ) { |
| | 442 | + if ( ( $this->params['catCount'] < 1 && false == $this->params['nameSpace'] ) |
| | 443 | + || ( $totalCatCount < $this->wgDPlminCategories ) ) { |
| 439 | 444 | // echo "Boom on catCount\n"; |
| 440 | 445 | $parser = new Parser; |
| 441 | 446 | $poptions = new ParserOptions; |