[Pkg-owncloud-commits] [owncloud] 35/165: fixing undefined variable
David Prévot
taffit at moszumanska.debian.org
Thu Apr 23 04:06:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit d9f23c0578c37bc9c61a7e2f8196027d6841fd75
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date: Fri Apr 17 14:25:57 2015 +0200
fixing undefined variable
---
apps/encryption/controller/statuscontroller.php | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/controller/statuscontroller.php
index fc06d7f..d29cca0 100644
--- a/apps/encryption/controller/statuscontroller.php
+++ b/apps/encryption/controller/statuscontroller.php
@@ -59,30 +59,30 @@ class StatusController extends Controller {
*/
public function getStatus() {
+ $status = 'error';
+ $message = '';
switch( $this->session->getStatus()) {
case Session::INIT_EXECUTED:
$status = 'success';
$message = (string)$this->l->t(
'Invalid private key for Encryption App. Please update your private'
. ' key password in your personal settings to recover access to your'
- . ' encrypted files.', array('app' => 'encryption'));
+ . ' encrypted files.');
break;
case Session::NOT_INITIALIZED:
$status = 'success';
$message = (string)$this->l->t(
'Encryption App is enabled but your keys are not initialized,'
- . ' please log-out and log-in again', array('app' => 'encryption'));
+ . ' please log-out and log-in again');
break;
- default:
- $status = 'error';
}
return new DataResponse(
- array(
+ [
'status' => $status,
- 'data' => array(
- 'message' => $message)
- )
+ 'data' => [
+ 'message' => $message]
+ ]
);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list