| Index: trunk/phase3/includes/FeedUtils.php |
| — | — | @@ -114,6 +114,7 @@ |
| 115 | 115 | # $wgLang->time( $timestamp ) ), |
| 116 | 116 | # wfMsg( 'currentrev' ) ); |
| 117 | 117 | |
| | 118 | + $diffText = ''; |
| 118 | 119 | // Don't bother generating the diff if we won't be able to show it |
| 119 | 120 | if ( $wgFeedDiffCutoff > 0 ) { |
| 120 | 121 | $de = new DifferenceEngine( $title, $oldid, $newid ); |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -115,10 +115,11 @@ |
| 116 | 116 | * @return String |
| 117 | 117 | */ |
| 118 | 118 | static function arrayToHeaderString( $headers, $endl = "\n" ) { |
| | 119 | + $strings = array(); |
| 119 | 120 | foreach( $headers as $name => $value ) { |
| 120 | | - $string[] = "$name: $value"; |
| | 121 | + $strings[] = "$name: $value"; |
| 121 | 122 | } |
| 122 | | - return implode( $endl, $string ); |
| | 123 | + return implode( $endl, $strings ); |
| 123 | 124 | } |
| 124 | 125 | |
| 125 | 126 | /** |
| Index: trunk/phase3/includes/api/ApiQueryBlocks.php |
| — | — | @@ -77,6 +77,9 @@ |
| 78 | 78 | |
| 79 | 79 | $this->addOption( 'LIMIT', $params['limit'] + 1 ); |
| 80 | 80 | $this->addTimestampWhereRange( 'ipb_timestamp', $params['dir'], $params['start'], $params['end'] ); |
| | 81 | + |
| | 82 | + $db = $this->getDB(); |
| | 83 | + |
| 81 | 84 | if ( isset( $params['ids'] ) ) { |
| 82 | 85 | $this->addWhereFld( 'ipb_id', $params['ids'] ); |
| 83 | 86 | } |
| — | — | @@ -100,7 +103,6 @@ |
| 101 | 104 | } |
| 102 | 105 | $prefix = substr( $lower, 0, 4 ); |
| 103 | 106 | |
| 104 | | - $db = $this->getDB(); |
| 105 | 107 | $this->addWhere( array( |
| 106 | 108 | 'ipb_range_start' . $db->buildLike( $prefix, $db->anyString() ), |
| 107 | 109 | "ipb_range_start <= '$lower'", |
| Index: trunk/phase3/includes/specials/SpecialActiveusers.php |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | $list = array(); |
| 131 | 131 | foreach( self::getGroups( $row->user_id ) as $group ) { |
| 132 | 132 | if ( isset( $this->groups[$group] ) ) { |
| 133 | | - return; |
| | 133 | + return ''; |
| 134 | 134 | } |
| 135 | 135 | $list[] = self::buildGroupLink( $group, $userName ); |
| 136 | 136 | } |