| Index: branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php |
| — | — | @@ -308,6 +308,9 @@ |
| 309 | 309 | * else false if it doesn't match (or was overridden) |
| 310 | 310 | */ |
| 311 | 311 | public function matches( $title, $action ) { |
| | 312 | + if ( !$title ) { |
| | 313 | + return false; |
| | 314 | + } |
| 312 | 315 | wfSuppressWarnings(); |
| 313 | 316 | $match = preg_match( "/^(?:{$this->mRegex})$/us" . ( isset( $this->mParams['casesensitive'] ) ? '' : 'i' ), $title->getFullText() ); |
| 314 | 317 | wfRestoreWarnings(); |
| Property changes on: branches/REL1_18/extensions/TitleBlacklist |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 315 | 318 | Merged /trunk/extensions/TitleBlacklist:r97583 |
| Index: branches/REL1_18/phase3/includes/profiler/ProfilerSimpleUDP.php |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | public function logData() { |
| 15 | 15 | global $wgUDPProfilerHost, $wgUDPProfilerPort; |
| 16 | 16 | |
| 17 | | - $this->collateData(); |
| | 17 | + $this->close(); |
| 18 | 18 | |
| 19 | 19 | if ( isset( $this->mCollated['-total'] ) && $this->mCollated['-total']['real'] < $this->mMinimumTime ) { |
| 20 | 20 | # Less than minimum, ignore |