[Pkg-owncloud-commits] [owncloud] 21/38: Fix "Only variables should be passed by reference" in stable7 template

David Prévot taffit at moszumanska.debian.org
Wed Mar 11 15:16:30 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 86e4177914831bba1d605509143f16df238ac368
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Mon Mar 2 14:29:41 2015 +0100

    Fix "Only variables should be passed by reference" in stable7 template
---
 lib/private/template.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index 983c0e3..4acbe4d 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -269,14 +269,17 @@ class OC_Template extends \OC\Template\Base {
 			while (method_exists($exception, 'previous') && $exception = $exception->previous()) {
 				$error_msg .= '<br/>Caused by:' . ' ';
 				if ($exception->getCode()) {
-					$error_msg .= '['.OC_Util::sanitizeHTML($exception->getCode()).'] ';
+					$code = $exception->getCode();
+					$error_msg .= '['.OC_Util::sanitizeHTML($code).'] ';
 				}
-				$error_msg .= OC_Util::sanitizeHTML($exception->getMessage());
+				$message = $exception->getMessage();
+				$error_msg .= OC_Util::sanitizeHTML($message);
 			};
 		} else {
 			$hint = '';
 			if ($exception instanceof \OC\HintException) {
-				$hint = OC_Util::sanitizeHTML($exception->getHint());
+				$hint = $exception->getHint();
+				$hint = OC_Util::sanitizeHTML($hint);
 			}
 		}
 		self::printErrorPage($error_msg, $hint);

-- 
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