- acp popup, shouldn't require 700 px width

- throw an error if an image that's edited into an imageset doesn't exist
- convert the password not its hash ;-)
- only update user_login_attempts if necessary
- make password requirements even clearer


git-svn-id: file:///svn/phpbb/trunk@7250 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/acp/acp_styles.php

@@ -1391,7 +1391,13 @@ parse_css_file = {PARSE_CSS_FILE}
 					// from the image itself ... we ignore width settings for the poll center
 					// image
 					$imgwidth = $imgheight = '';
-					if ($imgsize)
+
+					if ($imageset_path && !file_exists("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath"))
+					{
+						trigger_error($user->lang['NO_IMAGE_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					if ($imgsize && $imageset_path)
 					{
 						list($imgwidth, $imgheight) = getimagesize("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath");
 						$imgheight = '*' . $imgheight;