http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73440
Revision: 73440
Author: tomasz
Date: 2010-09-21 02:36:37 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
Removing debugging strings
Modified Paths:
--------------
branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerListLoader.php
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
Property Changed:
----------------
branches/wmf/1.16wmf4/extensions/CentralNotice/
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf-deployment/extensions/CentralNotice:60970
/trunk/extensions/CentralNotice:62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753,71774-71997,72058-72131,72136-73406,73433,73435,73437
/trunk/phase3/extensions/CentralNotice:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
+ /branches/wmf-deployment/extensions/CentralNotice:60970
/trunk/extensions/CentralNotice:62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753,71774-71997,72058-72131,72136-73406,73433,73435,73437,73439
/trunk/phase3/extensions/CentralNotice:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
Modified: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php
2010-09-21 02:33:24 UTC (rev 73439)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php
2010-09-21 02:36:37 UTC (rev 73440)
@@ -51,8 +51,6 @@
// smallish if you will. :)
$wgNoticeServerTimeout = 0;
-$cnDebug = '';
-
// Source for live counter information
$wgNoticeCounterSource = "http://donate.wikimedia.org/counter.php";;
Modified:
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerListLoader.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerListLoader.php
2010-09-21 02:33:24 UTC (rev 73439)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerListLoader.php
2010-09-21 02:36:37 UTC (rev 73440)
@@ -64,11 +64,9 @@
* Generate JSON for the specified site
*/
function getJsonList() {
- global $cnDebug;
// Quick short circuit to be able to show preferred notices
$templates = array();
- $cnDebug = ' //';
if ( $this->language == 'en' && $this->project != null ) {
// See if we have any preferred notices for all of en
@@ -78,7 +76,6 @@
// Pull banners
$templates =
CentralNoticeDB::selectTemplatesAssigned( $notices );
}
- $cnDebug .= ' 1';
}
if ( !$templates && $this->project == 'wikipedia' ) {
@@ -89,16 +86,14 @@
// Pull banners
$templates =
CentralNoticeDB::selectTemplatesAssigned( $notices );
}
- $cnDebug .= ' 2';
}
// Didn't find any preferred matches so do an old style lookup
if ( !$templates ) {
$templates = CentralNotice::selectNoticeTemplates(
$this->project, $this->language, $this->location );
- $cnDebug .= ' 3';
}
- return FormatJson::encode( $templates ) . $cnDebug;
+ return FormatJson::encode( $templates );
}
}
Modified:
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
2010-09-21 02:33:24 UTC (rev 73439)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
2010-09-21 02:36:37 UTC (rev 73440)
@@ -1005,14 +1005,10 @@
* @return A 2D array of running banners with associated weights and
settings
*/
static function selectNoticeTemplates( $project, $language, $location =
null ) {
- global $cnDebug, $wgDBname;
-
$campaigns = array();
$dbr = wfGetDB( DB_SLAVE );
$encTimestamp = $dbr->addQuotes( $dbr->timestamp() );
- $cnDebug .= ' project:'.$project.' language:'.$language.'
location:'.$location.' timestamp:'.$encTimestamp.' ';
-
// Pull non-geotargeted campaigns
$campaignResults1 = $dbr->select(
array(
@@ -1069,7 +1065,6 @@
$campaigns[] = $row->not_id;
}
}
- $cnDebug .= ' campaigns: '.count( $campaigns ).' database:
'.$wgDBname;
$templates = array();
if ( $campaigns ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
