[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove timeline old config

2016-08-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove timeline old config
..


Remove timeline old config

Switch to wfLoadExtension

Bug: T140852
Change-Id: Ic1042214e3f297cda9de724c43fbcca7eb5b1074
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 6 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 30d8cf8..9ad11c2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -672,20 +672,19 @@
 };
 
 if ( $wmgUseTimeline ) {
-   include( $IP . '/extensions/timeline/Timeline.php' );
-   $wgTimelineSettings = new stdClass; // Transitional, pending 303303
+   wfLoadExtension( 'timeline' );
if ( $wgDBname == 'testwiki' || $wgDBname == 'mlwiki' ) {
// FreeSansWMF has been generated from FreeSans and FreeSerif 
by using this script with fontforge:
// Open("FreeSans.ttf");
// MergeFonts("FreeSerif.ttf");
// SetFontNames("FreeSans-WMF", "FreeSans WMF", "FreeSans WMF 
Regular", "Regular", "");
// Generate("FreeSansWMF.ttf", "", 4 );
-   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'FreeSansWMF.ttf';
+   $wgTimelineFontFile = 'FreeSansWMF.ttf';
} elseif ( $lang == 'zh' ) {
-   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'unifont-5.1.20080907.ttf';
+   $wgTimelineFontFile = 'unifont-5.1.20080907.ttf';
}
-   $wgTimelineSettings->fileBackend = $wgTimelineFileBackend = 
'local-multiwrite';
-   $wgTimelineSettings->epochTimestamp = $wgTimelineEpochTimestamp = 
'2013060100';
+   $wgTimelineFileBackend = 'local-multiwrite';
+   $wgTimelineEpochTimestamp = '2013060100';
 }
 
 putenv( "GDFONTPATH=/srv/mediawiki/fonts" );

-- 
To view, visit https://gerrit.wikimedia.org/r/303303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1042214e3f297cda9de724c43fbcca7eb5b1074
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove timeline old config

2016-08-05 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/303303

Change subject: Remove timeline old config
..

Remove timeline old config

Switch to wfLoadExtension

Bug: T140852
Change-Id: Ic1042214e3f297cda9de724c43fbcca7eb5b1074
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/03/303303/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9dfca8e..7b246a3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -672,19 +672,19 @@
 };
 
 if ( $wmgUseTimeline ) {
-   include( $IP . '/extensions/timeline/Timeline.php' );
+   wfLoadExtension( 'timeline' );
if ( $wgDBname == 'testwiki' || $wgDBname == 'mlwiki' ) {
// FreeSansWMF has been generated from FreeSans and FreeSerif 
by using this script with fontforge:
// Open("FreeSans.ttf");
// MergeFonts("FreeSerif.ttf");
// SetFontNames("FreeSans-WMF", "FreeSans WMF", "FreeSans WMF 
Regular", "Regular", "");
// Generate("FreeSansWMF.ttf", "", 4 );
-   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'FreeSansWMF.ttf';
+   $wgTimelineFontFile = 'FreeSansWMF.ttf';
} elseif ( $lang == 'zh' ) {
-   $wgTimelineSettings->fontFile = $wgTimelineFontFile = 
'unifont-5.1.20080907.ttf';
+   $wgTimelineFontFile = 'unifont-5.1.20080907.ttf';
}
-   $wgTimelineSettings->fileBackend = $wgTimelineFileBackend = 
'local-multiwrite';
-   $wgTimelineSettings->epochTimestamp = $wgTimelineEpochTimestamp = 
'2013060100';
+   $wgTimelineFileBackend = 'local-multiwrite';
+   $wgTimelineEpochTimestamp = '2013060100';
 }
 
 putenv( "GDFONTPATH=/srv/mediawiki/fonts" );

-- 
To view, visit https://gerrit.wikimedia.org/r/303303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1042214e3f297cda9de724c43fbcca7eb5b1074
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits