Merge remote-tracking branch 'origin/development' into development

classes/controller/AdminController.php

@@ -1940,7 +1940,10 @@ class AdminControllerCore extends Controller
 			$this->context->shop = new Shop(Configuration::get('PS_SHOP_DEFAULT'));
 		elseif ($this->context->shop->id != $shop_id)
 			$this->context->shop = new Shop($shop_id);
-
+		
+		// Replace current default country		
+		$this->context->country = new Country((int)Configuration::get('PS_COUNTRY_DEFAULT'));
+				
 		$this->initBreadcrumbs();
 	}
 

config/alias.php

@@ -73,8 +73,10 @@ function bqSQL($string)
 
 function displayFatalError()
 {
-	$error = error_get_last();
+	$error = null;
-	if ($error !== NULL && in_array($error['type'], array(E_ERROR, E_PARSE)))
+	if (function_exists('error_get_last'))
+		$error = error_get_last();
+	if ($error !== NULL && in_array($error['type'], array(E_ERROR, E_PARSE, E_COMPILE_ERROR )))
 		echo '[PrestaShop] Fatal error in module '.substr(basename($error['file']), 0, -4).':<br />'.$error['message'];
 }
 

controllers/admin/AdminCustomersController.php

@@ -304,7 +304,7 @@ class AdminCustomersControllerCore extends AdminController
 					'name' => 'passwd',
 					'size' => 33,
 					'required' => ($obj->id ? false : true),
-					'desc' => ($obj->id ? $this->l('Leave  this field blank if there\'s no change') : $this->l('Minimum of five characters (only letters and numbers).').' -_')
+					'desc' => ($obj->id ? $this->l('Leave  this field blank if there\'s no change') : $this->l('Minimum of five characters'))
 				),
 				array(
 					'type' => 'birthday',

controllers/admin/AdminEmployeesController.php

@@ -190,7 +190,7 @@ class AdminEmployeesControllerCore extends AdminController
 					'size' => 33,
 					'desc' => ($obj->id ?
 								$this->l('Leave this field blank if you do not want to change your password.') :
-									$this->l('Minimum of eight characters (use only letters and numbers)').' -_')
+									$this->l('Minimum of eight characters'))
 				),
 				array(
 					'type' => 'text',

install-dev/theme/views/configure.phtml

@@ -142,7 +142,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<?php if ($this->displayError('admin_password')): ?>
 			<?php echo $this->displayError('admin_password') ?>
 		<?php else: ?>
-			<p class="userInfos aligned"><?php echo $this->l('Must be letters and numbers with at least 8 characters') ?></p>
+			<p class="userInfos aligned"><?php echo $this->l('Must be at least 8 characters') ?></p>
 		<?php endif; ?>
 	</div>