diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 15:21:09 +0200 |
| commit | ae3425d2dadbac69e7dcb0ba577db20e63e7d91f (patch) | |
| tree | f483759739cd951c33ef1c61ade8694f9e1c95e3 /settings/admin/controller.php | |
| parent | 3329e0f2b22207a24ddb4953bbf11964b23682d9 (diff) | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| download | nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.tar.gz nextcloud-server-ae3425d2dadbac69e7dcb0ba577db20e63e7d91f.zip | |
Merge branch 'master' into securityutils
Conflicts:
lib/private/util.php
Diffstat (limited to 'settings/admin/controller.php')
| -rw-r--r-- | settings/admin/controller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/admin/controller.php b/settings/admin/controller.php index 7ced57791e9..395bc7c6e49 100644 --- a/settings/admin/controller.php +++ b/settings/admin/controller.php @@ -27,7 +27,7 @@ class Controller { \OC_Util::checkAdminUser(); \OCP\JSON::callCheck(); - $l = \OC_L10N::get('settings'); + $l = \OC::$server->getL10N('settings'); $smtp_settings = array( 'mail_domain' => null, @@ -80,7 +80,7 @@ class Controller { \OC_Util::checkAdminUser(); \OCP\JSON::callCheck(); - $l = \OC_L10N::get('settings'); + $l = \OC::$server->getL10N('settings'); $email = \OC_Preferences::getValue(\OC_User::getUser(), 'settings', 'email', ''); if (!empty($email)) { $defaults = new \OC_Defaults(); |