From 80e10f01c42ec43c09816668a3aff28d55ef65b9 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Fri, 30 Aug 2013 13:16:13 +0200
Subject: [PATCH] Clean up
---
3rdparty | 2 +-
core/avatar/controller.php | 6 +++---
settings/personal.php | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/3rdparty b/3rdparty
index 9d8b5602ecb..21b466b72cd 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 9d8b5602ecb35697919e2a548e2a704058a6d21a
+Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index 9666fd879fb..66ee7edafbe 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -109,8 +109,8 @@ class OC_Core_Avatar_Controller {
// Clean up
\OC_Cache::remove('tmpavatar');
\OC_JSON::success();
- } catch (\Exception $e) {
- \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
- }
+ } catch (\Exception $e) {
+ \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+ }
}
}
diff --git a/settings/personal.php b/settings/personal.php
index b0d62645d5a..6a6619d5a14 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -87,7 +87,6 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
-$tmpl->assign('avatar', OC_Config::getValue('avatar', 'local'));
$forms=OC_App::getForms('personal');
$tmpl->assign('forms', array());
--
GitLab