Merge branch 'master' into number_alias_as_vm_id

Conflicts: app/hot_desking/extension_edit.php
2015-07-21 11:19:13 +04:00
parent b4435c974e 7cf424003c
commit a4b0b2d271
79 changed files with 1168 additions and 1163 deletions
@@ -474,9 +474,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 							$sql .= "'$extension_uuid', ";
 							$sql .= "'$extension', ";
 							$sql .= "'$number_alias', ";
-							if (permission_exists('extension_password')) {
-								$sql .= "'$password', ";
-							}
+							$sql .= "'$password', ";
 							if (if_group("superadmin") || (if_group("admin") && $billing_app_exists)) {
 								$sql .= "'$accountcode', ";
 							}