jenkins-bot has submitted this change and it was merged.
Change subject: Use $wgExtensionAssetsPath instead of $wgScriptPath
......................................................................
Use $wgExtensionAssetsPath instead of $wgScriptPath
Change-Id: I8ac486e63a5aa1be893d743b685b84438201aad7
---
M SpecialArticleLists.php
M SpecialArticlesHome.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialArticleLists.php b/SpecialArticleLists.php
index 6fa9556..e8f4f8a 100644
--- a/SpecialArticleLists.php
+++ b/SpecialArticleLists.php
@@ -20,7 +20,7 @@
* @param $limit Integer: show this many entries (LIMIT for SQL)
*/
public function execute( $limit ) {
- global $wgMemc, $wgScriptPath;
+ global $wgMemc, $wgExtensionAssetsPath;
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 'ah-new-articles' ) );
@@ -37,7 +37,7 @@
// the parser cache
$out->addModules( 'ext.blogPage.articlesHome' );
- $imgPath = $wgScriptPath . '/extensions/BlogPage/images/';
+ $imgPath = $wgExtensionAssetsPath . '/BlogPage/images/';
$output = '<div class="left-articles">';
if ( !$this->including() ) {
diff --git a/SpecialArticlesHome.php b/SpecialArticlesHome.php
index 8403003..1eb8914 100644
--- a/SpecialArticlesHome.php
+++ b/SpecialArticlesHome.php
@@ -25,7 +25,7 @@
* @param $type String: what kind of articles to show? Default is
'popular'
*/
public function execute( $type ) {
- global $wgContLang, $wgScriptPath, $wgSupressPageTitle;
+ global $wgContLang, $wgSupressPageTitle;
$wgSupressPageTitle = true;
@@ -142,7 +142,7 @@
* @return String: HTML
*/
public function getPopularPosts() {
- global $wgMemc, $wgScriptPath;
+ global $wgMemc, $wgExtensionAssetsPath;
// Try cache first
$key = wfMemcKey( 'blog', 'popular', 'twentyfive' );
@@ -195,7 +195,7 @@
$wgMemc->set( $key, $popularBlogPosts, 60 * 15 );
}
- $imgPath = $wgScriptPath . '/extensions/BlogPage/images/';
+ $imgPath = $wgExtensionAssetsPath . '/BlogPage/images/';
$output = '<div class="listpages-container">';
if ( empty( $popularBlogPosts ) ) {
@@ -517,7 +517,7 @@
* @return String: HTML
*/
public function getNewestPosts() {
- global $wgMemc, $wgScriptPath;
+ global $wgMemc, $wgExtensionAssetsPath;
// Try cache first
$key = wfMemcKey( 'blog', 'newest', 'twentyfive' );
@@ -560,7 +560,7 @@
$wgMemc->set( $key, $newestBlogPosts, 60 * 15 );
}
- $imgPath = $wgScriptPath . '/extensions/BlogPage/images/';
+ $imgPath = $wgExtensionAssetsPath . '/BlogPage/images/';
$output = '<div class="listpages-container">';
if ( empty( $newestBlogPosts ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/161659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ac486e63a5aa1be893d743b685b84438201aad7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
