Merge branch 'hotfix-2.2.37' into develop

2014-08-21 15:29:18 +02:00 · 2014-08-21 15:29:18 +02:00 · d5ac3dea49
parent 9735a3041f b6ee897b82
commit d5ac3dea49
1 changed files with 1 additions and 0 deletions
--- a/app/Model/User.php
+++ b/app/Model/User.php
@ -406,6 +406,7 @@ class User extends AppModel {
 		$result = $this->find('first', array(
 			'recursive' => -1,
 			'fields' => array('id', 'gpgkey'),
+			'conditions' => array('id' => $id),
 		));
 		return $result['User']['gpgkey'];
 	}