implement suggested improvments

Author: zero-24

components/com_content/helpers/icon.php

@@ -73,12 +73,8 @@ public static function email($article, $params, $attribs = array(), $legacy = fa
 		$link     = $base . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language), false);
 		$url      = 'index.php?option=com_mailto&tmpl=component&template=' . $template . '&link=' . MailtoHelper::addLink($link);
 
-		$status = 'width=400,height=550,menubar=yes,resizable=yes';
-
-		if (JFactory::getApplication()->get('captcha', '0') === '0')
-		{
-			$status = 'width=400,height=450,menubar=yes,resizable=yes';
-		}
+		$height = JFactory::getApplication()->get('captcha', '0') === '0' ? 450 : 550;
+		$status = 'width=400,height=' . $height . ',menubar=yes,resizable=yes';
 
 		$text = JLayoutHelper::render('joomla.content.icons.email', array('params' => $params, 'legacy' => $legacy));
 

components/com_mailto/models/mailto.php

@@ -53,8 +53,6 @@ protected function loadFormData()
 	{
 		$user = JFactory::getUser();
 		$app  = JFactory::getApplication();
-		$data = array();
-
 		$data = $app->getUserState('mailto.mailto.form.data', array());
 
 		$data['link'] = urldecode($app->input->get('link', '', 'BASE64'));
@@ -100,7 +98,6 @@ public function getData()
 		$data['sender']    = $input->get('sender', '', 'string');
 		$data['emailfrom'] = $input->get('emailfrom', '', 'string');
 		$data['subject']   = $input->get('subject', '', 'string');
-		$data['captcha']   = $input->get('captcha', '', 'string');
 
 		return $data;
 	}