http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97612
Revision: 97612
Author: reedy
Date: 2011-09-20 10:04:57 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
REL1_18: MFT r97590, r97583
Modified Paths:
--------------
branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
branches/REL1_18/phase3/includes/profiler/ProfilerSimpleUDP.php
Property Changed:
----------------
branches/REL1_18/extensions/TitleBlacklist/
Property changes on: branches/REL1_18/extensions/TitleBlacklist
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/extensions/TitleBlacklist:97583
Modified: branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
===================================================================
--- branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
2011-09-20 09:25:33 UTC (rev 97611)
+++ branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
2011-09-20 10:04:57 UTC (rev 97612)
@@ -308,6 +308,9 @@
* else false if it doesn't match (or was overridden)
*/
public function matches( $title, $action ) {
+ if ( !$title ) {
+ return false;
+ }
wfSuppressWarnings();
$match = preg_match( "/^(?:{$this->mRegex})$/us" . ( isset(
$this->mParams['casesensitive'] ) ? '' : 'i' ), $title->getFullText() );
wfRestoreWarnings();
Modified: branches/REL1_18/phase3/includes/profiler/ProfilerSimpleUDP.php
===================================================================
--- branches/REL1_18/phase3/includes/profiler/ProfilerSimpleUDP.php
2011-09-20 09:25:33 UTC (rev 97611)
+++ branches/REL1_18/phase3/includes/profiler/ProfilerSimpleUDP.php
2011-09-20 10:04:57 UTC (rev 97612)
@@ -13,7 +13,7 @@
public function logData() {
global $wgUDPProfilerHost, $wgUDPProfilerPort;
- $this->collateData();
+ $this->close();
if ( isset( $this->mCollated['-total'] ) &&
$this->mCollated['-total']['real'] < $this->mMinimumTime ) {
# Less than minimum, ignore
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
