Merge branch 'master' into 'stable-3.1'

changed regex for backup_dir (allow empty backup-dir to disable backups)



See merge request !296

Author: Marius Burkard

interface/web/admin/form/server_config.tform.php

@@ -170,7 +170,7 @@
 			'formtype' => 'TEXT',
 			'default' => '/var/backup',
 			'validators' => array(	0 => array ( 	'type' => 'REGEX',
-										'regex' => '/^\/[a-zA-Z0-9\.\-\_\/]{5,128}$/',
+										'regex' => "/(|^\\/{1,2}(?:[\\w-]+[.]?\\/?){5,128})$/";
 										'errmsg'=> 'backup_dir_error_regex'),
 			),
 			'value' => '',