[Pkg-owncloud-commits] [owncloud] 101/205: set NULL correctly in password update

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 6977eff10625a8fd5e8a579aeba108c5b94ea85f
Author: Roeland Jago Douma <roeland at famdouma.nl>
Date:   Wed Jun 24 12:36:26 2015 +0200

    set NULL correctly in password update
    
    Old code used 'NULL' but docterine wants null. Now it is possible again
    to remove the password from a link share.
---
 lib/private/share/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 027c518..954071f 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1220,7 +1220,7 @@ class Share extends Constants {
 		$qb->update('`*PREFIX*share`')
 			->set('`share_with`', ':pass')
 			->where('`id` = :shareId')
-			->setParameter(':pass', is_null($password) ? 'NULL' : \OC::$server->getHasher()->hash($password))
+			->setParameter(':pass', is_null($password) ? null : \OC::$server->getHasher()->hash($password))
 			->setParameter(':shareId', $shareId);
 
 		$qb->execute();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git