diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
| commit | f19276f7bc5fa74dff749112fffd350dad662148 (patch) | |
| tree | cf0ff38b4f42f4a0272b402a07f3fd91c7cd4c69 /core/js | |
| parent | fbea02bebb561f7a76a876065066c9face6e484e (diff) | |
| parent | fe24aafe7d55044e8e03a6ca2fc116174966951e (diff) | |
| download | nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.tar.gz nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.zip | |
Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
config/config.sample.php
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/config.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/js/config.php b/core/js/config.php index b6875fb73f9..139c3b6d485 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -24,6 +24,7 @@ foreach(OC_App::getEnabledApps() as $app) { $array = array( "oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false', + "oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false', "oc_webroot" => "\"".OC::$WEBROOT."\"", "oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), |