会員の登録できなくなったバグ修正

NetCommons3 · Aug 30, 2016 · dbe845a · dbe845a
1 parent 78c092f
commit dbe845a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/Model/Behavior/AvatarBehavior.php b/Model/Behavior/AvatarBehavior.php
@@ -125,7 +125,7 @@ public function temporaryAvatar(Model $model, $user, $fieldName, $size = null) {
 			$noimage = User::AVATAR_IMG;
 		}
 		if (! class_exists('Imagick') || ! $model->Behaviors->hasMethod('createAvatarAutomatically')) {
-			return App::pluginPath('Users') . DS . 'webroot' . DS . 'img' . DS . $noimage;
+			return App::pluginPath('Users') . 'webroot' . DS . 'img' . DS . $noimage;
 		}
 
 		$path = TMP . $fieldName;

diff --git a/View/Helper/UserEditFormHelper.php b/View/Helper/UserEditFormHelper.php
@@ -438,16 +438,25 @@ private function __image($fieldName, $userAttribute, $attributes = array()) {
 		$output = '';
 		$userAttributeKey = $userAttribute['UserAttribute']['key'];
 
-		if ($this->_View->request->params['plugin'] === 'user_manager' &&
-				$this->_View->request->params['controller'] === 'user_manager') {
-			$attributes['url'] = array(
-				'plugin' => 'user_manager',
-				'controller' => 'user_manager',
-				'action' => 'download',
-				'key' => Hash::get($this->_View->request->data, 'User.id'),
-				'key2' => $userAttributeKey,
-				'medium',
-			);
+		if ($this->_View->request->params['plugin'] === 'user_manager') {
+			if ($this->_View->request->params['controller'] === 'user_add') {
+				$attributes['url'] = array(
+					'plugin' => 'user_manager',
+					'controller' => 'user_add',
+					'action' => 'download',
+					'key' => $userAttributeKey,
+					'medium',
+				);
+			} else {
+				$attributes['url'] = array(
+					'plugin' => 'user_manager',
+					'controller' => 'user_manager',
+					'action' => 'download',
+					'key' => Hash::get($this->_View->request->data, 'User.id'),
+					'key2' => $userAttributeKey,
+					'medium',
+				);
+			}
 		} else {
 			$attributes['url'] = array(
 				'plugin' => 'users',