// Merge -> revision 9435

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
parent 43958d54e7
commit 42564ca3d0
35 changed files with 853 additions and 572 deletions
@@ -66,6 +66,14 @@ class AdminEmails extends AdminPreferences

 	public function beforeUpdateOptions()
 	{
+		/* PrestaShop demo mode */
+		if (_PS_MODE_DEMO_)
+		{
+			$this->_errors[] = Tools::displayError('This functionnality has been disabled.');
+			return;
+		}
+		/* PrestaShop demo mode*/
+
 		if ($_POST['PS_MAIL_METHOD'] == 2 AND (empty($_POST['PS_MAIL_SERVER']) OR empty($_POST['PS_MAIL_SMTP_PORT'])))
 			$this->_errors[] = Tools::displayError('You must define a SMTP server and a SMTP port. If you do not know, use the PHP mail() function instead.');
 	}
@@ -73,6 +81,7 @@ class AdminEmails extends AdminPreferences
 	public function display()
 	{
 		parent::display();
+
 		$this->_displayMailTest();
 	}