http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72135
Revision: 72135
Author: tomasz
Date: 2010-09-01 18:14:17 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Sync'ing up to trunk head at 72131
Modified Paths:
--------------
branches/wmf/1.16wmf4/extensions/CentralNotice/NoticePage.php
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeLocal.php
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeText.php
branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildLocalTemplates.php
branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildTemplates.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
/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
/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/NoticePage.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/NoticePage.php
2010-09-01 18:14:15 UTC (rev 72134)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/NoticePage.php
2010-09-01 18:14:17 UTC (rev 72135)
@@ -5,13 +5,13 @@
global $wgOut;
$wgOut->disable();
$this->sendHeaders();
- $js = $this->getJsOutput( $par );
+ $content = $this->getOutput( $par );
- if ( strlen( $js ) == 0 ) {
+ if ( strlen( $content ) == 0 ) {
/* Hack for IE/Mac 0-length keepalive problem, see
RawPage.php */
echo "/* Empty */";
} else {
- echo $js;
+ echo $content;
}
}
@@ -40,7 +40,7 @@
// header( "Last-modified: $epoch" );
}
- function getJsOutput( $par ) {
+ function getOutput( $par ) {
return "";
}
}
Modified:
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
2010-09-01 18:14:15 UTC (rev 72134)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialCentralNotice.php
2010-09-01 18:14:17 UTC (rev 72135)
@@ -614,7 +614,7 @@
// Handle new project name
$projectName = $wgRequest->getVal(
'project_name' );
- if ( $projectName ) {
+ if ( isset( $projectName ) ) {
$this->updateProjectName (
$notice, $projectName );
}
@@ -946,7 +946,7 @@
/**
* Lookup function for active banners under a given language and
project. This function is
- * called by SpecialNoticeText::getJsOutput() in order to build the
static Javascript files for
+ * called by SpecialNoticeText::getOutput() in order to build the
static Javascript files for
* each project.
* @return A 2D array of running banners with associated weights and
settings
*/
Modified: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeLocal.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeLocal.php
2010-09-01 18:14:15 UTC (rev 72134)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeLocal.php
2010-09-01 18:14:17 UTC (rev 72135)
@@ -12,7 +12,7 @@
return 7200;
}
- function getJsOutput( $par ) {
+ function getOutput( $par ) {
$text = '';
if ( $par == 'anonnotice.js' ) {
$text = wfGetCachedNotice( 'anonnotice' );
Modified: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeText.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeText.php
2010-09-01 18:14:15 UTC (rev 72134)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialNoticeText.php
2010-09-01 18:14:17 UTC (rev 72135)
@@ -27,7 +27,7 @@
/**
* Given a project key, generate the body for a static Javascript file
*/
- function getJsOutput( $par ) {
+ function getOutput( $par ) {
// Break $par into separate parameters and assign to
$this->project and $this->language
$this->setLanguage( $par );
Modified:
branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildLocalTemplates.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildLocalTemplates.php
2010-09-01 18:14:15 UTC (rev 72134)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildLocalTemplates.php
2010-09-01 18:14:17 UTC (rev 72135)
@@ -22,7 +22,7 @@
echo "$wgDBname/$key\n";
$builder = new SpecialNoticeLocal();
- $js = $builder->getJsOutput( $key );
+ $js = $builder->getOutput( $key );
$outputDir = $wgNoticeLocalDirectory;
if ( wfMkDirParents( $outputDir ) ) {
Modified: branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildTemplates.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildTemplates.php
2010-09-01 18:14:15 UTC (rev 72134)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/rebuildTemplates.php
2010-09-01 18:14:17 UTC (rev 72135)
@@ -30,7 +30,7 @@
echo "$key\n";
$builder = new SpecialNoticeText();
- $js = $builder->getJsOutput( $key );
+ $js = $builder->getOutput( $key );
if ( isset( $options['o'] ) ) {
$outputDir =
"$wgNoticeCentralDirectory/$project/$lang";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
