Commit 0de60c51 authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #11498 from owncloud/detectDomainForDocumentation

Add support for keys in the info.xml
parents cc717c27 16cd7490
......@@ -16,4 +16,7 @@
<files>appinfo/remote.php</files>
<webdav>appinfo/remote.php</webdav>
</remote>
<documentation>
<user>user-files</user>
</documentation>
</info>
......@@ -11,7 +11,8 @@
<requiremin>4</requiremin>
<shipped>true</shipped>
<documentation>
<user>user-encryption</user>
<admin>admin-encryption</admin>
</documentation>
<rememberlogin>false</rememberlogin>
<types>
......
......@@ -11,6 +11,9 @@
<author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>
<requiremin>4.93</requiremin>
<shipped>true</shipped>
<documentation>
<admin>admin-external-storage</admin>
</documentation>
<types>
<filesystem/>
</types>
......
......@@ -15,5 +15,8 @@ To prevent a user from running out of disk space, the ownCloud Deleted files app
<types>
<filesystem/>
</types>
<documentation>
<user>user-trashbin</user>
</documentation>
<ocsid>166052</ocsid>
</info>
......@@ -14,6 +14,9 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n
<types>
<filesystem/>
</types>
<documentation>
<user>user-versions</user>
</documentation>
<default_enable/>
<ocsid>166053</ocsid>
</info>
......@@ -15,7 +15,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
<authentication/>
</types>
<documentation>
<admin>http://doc.owncloud.org/server/7.0/go.php?to=admin-ldap</admin>
<admin>admin-ldap</admin>
</documentation>
<ocsid>166061</ocsid>
</info>
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment