diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-05-04 17:04:11 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-04 17:04:11 +0200 |
| commit | 1e471562268ff62c59708b724c22930bc1d01d95 (patch) | |
| tree | 5b5125ec41e865fa009d51b4293042f6572067f4 /lib/json.php | |
| parent | 71f9b1968e3d4decc4395db2a1555a872cbb2820 (diff) | |
| parent | 07ff1e723ae4fa3a0297b168ef2262e01a0a5e50 (diff) | |
| download | nextcloud-server-1e471562268ff62c59708b724c22930bc1d01d95.tar.gz nextcloud-server-1e471562268ff62c59708b724c22930bc1d01d95.zip | |
Merge branch 'master' into tasks
Diffstat (limited to 'lib/json.php')
| -rw-r--r-- | lib/json.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/json.php b/lib/json.php index cedf79fd7c3..0d208ce12a2 100644 --- a/lib/json.php +++ b/lib/json.php @@ -24,7 +24,7 @@ class OC_JSON{ */ public static function checkAppEnabled($app){ if( !OC_App::isEnabled($app)){ - $l = new OC_L10N('core'); + $l = OC_L10N::get('core'); self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled') ))); exit(); } @@ -35,7 +35,7 @@ class OC_JSON{ */ public static function checkLoggedIn(){ if( !OC_User::isLoggedIn()){ - $l = new OC_L10N('core'); + $l = OC_L10N::get('core'); self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); } @@ -47,7 +47,7 @@ class OC_JSON{ public static function checkAdminUser(){ self::checkLoggedIn(); if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - $l = new OC_L10N('core'); + $l = OC_L10N::get('core'); self::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); } |