diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
| commit | b483f2aab856e3324026588a9702043072fd7ad2 (patch) | |
| tree | 9a5696d43ae53160bee592e1b6874185cbd98ad4 /settings/admin.php | |
| parent | cbaf858dea0f2094805edb6aa223bdd6877fff5b (diff) | |
| parent | 598815b21e94219eb66684c64802e165a35180ad (diff) | |
| download | nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.tar.gz nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.zip | |
Merge branch 'master' into routing
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
Diffstat (limited to 'settings/admin.php')
| -rwxr-xr-x | settings/admin.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/settings/admin.php b/settings/admin.php index 6909e02d14f..8788de940b3 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -30,6 +30,10 @@ $tmpl->assign('entries',$entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking',$htaccessworking); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); +$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); +$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); +$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); +$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global')); $tmpl->assign('forms',array()); foreach($forms as $form){ $tmpl->append('forms',$form); |