diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-10-09 16:57:15 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-10-09 16:57:15 +0200 |
commit | 0de60c51a126c04ded02ce6d089e08bd7432a14a (patch) | |
tree | 5e78543e32057946d659f5e6b331e64a3ac97a7f /lib | |
parent | cc717c27d6cbfadfff4dc6cdfe110baccd097c84 (diff) | |
parent | 16cd74906501faf15946d2506037cba90cca7882 (diff) | |
download | nextcloud-server-0de60c51a126c04ded02ce6d089e08bd7432a14a.tar.gz nextcloud-server-0de60c51a126c04ded02ce6d089e08bd7432a14a.zip |
Merge pull request #11498 from owncloud/detectDomainForDocumentation
Add support for keys in the info.xml
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/app.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 3eed9e3c443..1d406fb967e 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -659,7 +659,15 @@ class OC_App { $data[$child->getName()] = substr($xml, 13, -14); //script <description> tags } elseif ($child->getName() == 'documentation') { foreach ($child as $subChild) { - $data["documentation"][$subChild->getName()] = (string)$subChild; + $url = (string) $subChild; + + // If it is not an absolute URL we assume it is a key + // i.e. admin-ldap will get converted to go.php?to=admin-ldap + if(!\OC::$server->getHTTPHelper()->isHTTPURL($url)) { + $url = OC_Helper::linkToDocs($url); + } + + $data["documentation"][$subChild->getName()] = $url; } } else { $data[$child->getName()] = (string)$child; |