* when detect mysqldump, trim the result.

2013-02-02 05:33:27 +00:00
parent d49503f2d6
commit 10e7e90ca3
1 changed files with 3 additions and 2 deletions
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -476,15 +476,16 @@ class installModel extends model
                if(strpos($mysql, 'mysqld.exe') !== false)
                {
                    $mysql = explode("\n", $mysql);
-                    if(isset($mysql[1])) $mysqldump = str_replace('mysqld.exe', 'mysqldump.exe', $mysql[1]);
+                    if(isset($mysql[1])) $mysqldump = trim(str_replace('mysqld.exe', 'mysqldump.exe', $mysql[1]));
                }
            }
            else
            {
-                $mysqldump = `which mysqldump`;
+                $mysqldump = trim(`which mysqldump`);
            }
        }

        if(file_exists($mysqldump)) return $mysqldump;
+        return '';
    }
 }