mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://anongit.kde.org/owncloud

This commit is contained in:
Hans Bakker 2011-08-15 17:41:46 +02:00
parent 4f3fdf6c45 4a52886728
commit 66576de1b7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/layout.guest.php
View File

@ -35,6 +35,6 @@
</div></header>
<?php echo $_['content']; ?>
</div>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'is a personal cloud which runs on your own server' ); ?>.</p></footer>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you the freedom to control your own data on the internet' ); ?></p></footer>
</body>
</html>

9
settings/apps.php
View File

@ -46,9 +46,11 @@ foreach($registeredApps as $app){
}
}
$categories=array_keys(OC_OCSClient::getCategories());
$externalApps=OC_OCSClient::getApplications($categories);
foreach($externalApps as $app){
$catagoryNames=OC_OCSClient::getCategories();
if(is_array($catagoryNames)){
$categories=array_keys($catagoryNames);
$externalApps=OC_OCSClient::getApplications($categories);
foreach($externalApps as $app){
$apps[]=array(
'name'=>$app['name'],
'id'=>$app['id'],
@ -56,6 +58,7 @@ foreach($externalApps as $app){
'description'=>$app['description'],
'author'=>$app['personid'],
);
}
}