| Index: trunk/phase3/includes/api/ApiQueryLogEvents.php |
| — | — | @@ -118,7 +118,7 @@ |
| 119 | 119 | $this->addOption( 'USE INDEX', array( 'logging' => $index ) ); |
| 120 | 120 | } |
| 121 | 121 | // Paranoia: avoid brute force searches (bug 17342) |
| 122 | | - if (!is_null($title) || !is_null($params['type'])) { |
| | 122 | + if (!is_null($title)) { |
| 123 | 123 | $this->addWhere('log_deleted & ' . LogPage::DELETED_ACTION . ' = 0'); |
| 124 | 124 | } |
| 125 | 125 | if (!is_null($user)) { |
| — | — | @@ -200,19 +200,19 @@ |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | if ($this->fld_title) { |
| 204 | | - $title = Title :: makeTitle($row->log_namespace, $row->log_title); |
| 205 | | - ApiQueryBase :: addTitleInfo($vals, $title); |
| 206 | | - } |
| 207 | | - |
| 208 | | - if ($this->fld_type) { |
| 209 | 204 | if (LogEventsList::isDeleted($row, LogPage::DELETED_ACTION)) { |
| 210 | 205 | $vals['actionhidden'] = ''; |
| 211 | 206 | } else { |
| 212 | | - $vals['type'] = $row->log_type; |
| 213 | | - $vals['action'] = $row->log_action; |
| | 207 | + $title = Title :: makeTitle($row->log_namespace, $row->log_title); |
| | 208 | + ApiQueryBase :: addTitleInfo($vals, $title); |
| 214 | 209 | } |
| 215 | 210 | } |
| 216 | 211 | |
| | 212 | + if ($this->fld_type) { |
| | 213 | + $vals['type'] = $row->log_type; |
| | 214 | + $vals['action'] = $row->log_action; |
| | 215 | + } |
| | 216 | + |
| 217 | 217 | if ($this->fld_details && $row->log_params !== '') { |
| 218 | 218 | if (LogEventsList::isDeleted($row, LogPage::DELETED_ACTION)) { |
| 219 | 219 | $vals['actionhidden'] = ''; |