[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensionInfo: Using real url from extension.json if exists

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

Change subject: BSExtensionInfo: Using real url from extension.json if exists
..


BSExtensionInfo: Using real url from extension.json if exists

Change-Id: I455a49e8f4712feba81ff3a60bd1627a606a21ed
---
M ExtensionInfo/includes/ViewExtensionInfoTable.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/ExtensionInfo/includes/ViewExtensionInfoTable.php 
b/ExtensionInfo/includes/ViewExtensionInfoTable.php
index 4b9ae5a..53323ae 100644
--- a/ExtensionInfo/includes/ViewExtensionInfoTable.php
+++ b/ExtensionInfo/includes/ViewExtensionInfoTable.php
@@ -101,12 +101,14 @@
 * @return string The URL that points to the aproppriate helpdesk entry.
 */
private function getHelpdeskUrl( $aExtensionInfo ) {
+   if( !empty( $aExtensionInfo['url'] ) ) {
+   return $aExtensionInfo['url'];
+   }
//(09.05.2012)PW: added helpdeskurls to mI18n-files
//$baseUrl = 
BsConfig::get('MW::ExtensionInfo::HelpdeskBaseUrl');
$baseUrl = 'http://help.blue-spice.org/index.php';
$sExtensionName = $aExtensionInfo['name'];
-   $sUrl = $baseUrl . '/' . $sExtensionName;
-   return $sUrl;
+   return "$baseUrl/$sExtensionName";
}
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I455a49e8f4712feba81ff3a60bd1627a606a21ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensionInfo: Using real url from extension.json if exists

2016-10-13 Thread Pwirth (Code Review) 
Pwirth has uploaded a new change for review.

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

Change subject: BSExtensionInfo: Using real url from extension.json if exists
..

BSExtensionInfo: Using real url from extension.json if exists

Change-Id: I455a49e8f4712feba81ff3a60bd1627a606a21ed
---
M ExtensionInfo/includes/ViewExtensionInfoTable.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/87/315687/1

diff --git a/ExtensionInfo/includes/ViewExtensionInfoTable.php 
b/ExtensionInfo/includes/ViewExtensionInfoTable.php
index 4b9ae5a..53323ae 100644
--- a/ExtensionInfo/includes/ViewExtensionInfoTable.php
+++ b/ExtensionInfo/includes/ViewExtensionInfoTable.php
@@ -101,12 +101,14 @@
 * @return string The URL that points to the aproppriate helpdesk entry.
 */
private function getHelpdeskUrl( $aExtensionInfo ) {
+   if( !empty( $aExtensionInfo['url'] ) ) {
+   return $aExtensionInfo['url'];
+   }
//(09.05.2012)PW: added helpdeskurls to mI18n-files
//$baseUrl = 
BsConfig::get('MW::ExtensionInfo::HelpdeskBaseUrl');
$baseUrl = 'http://help.blue-spice.org/index.php';
$sExtensionName = $aExtensionInfo['name'];
-   $sUrl = $baseUrl . '/' . $sExtensionName;
-   return $sUrl;
+   return "$baseUrl/$sExtensionName";
}
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I455a49e8f4712feba81ff3a60bd1627a606a21ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth 

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