// Merge -> revision 8734

This commit is contained in:
rMalie
2011-09-23 14:06:47 +00:00
parent dc957d3d3a
commit 1d44d06528
4 changed files with 20 additions and 12 deletions
+1 -1
View File
@@ -66,7 +66,7 @@ class ToolsInstall
!isset($_GET['name']) OR empty($_GET['name']) OR !Validate::isUnixName($_GET['name']),
!isset($_GET['login']) OR empty($_GET['login']) OR !Validate::isUnixName($_GET['login']),
!isset($_GET['password']),
!isset($_GET['tablePrefix']) OR !Validate::isTablePrefix($_GET['tablePrefix']),
(!isset($_GET['tablePrefix']) OR !Validate::isTablePrefix($_GET['tablePrefix'])) && !empty($_GET['tablePrefix']),
);
foreach ($data_check AS $data)
+1 -1
View File
@@ -372,7 +372,7 @@ function verifyDbAccess ()
+"&password="+encodeURIComponent($("#dbPassword").val())
+"&engine="+$("#dbEngine option:selected").val()
+ "&name=" + $("#dbName").val()
+ "&tablePrefix=" + $("#db_prefix").val(),
+ "&tablePrefix=" + encodeURIComponent($("#db_prefix").val()),
success: function(ret)
{
ret = ret.getElementsByTagName('action')[0];