diff options
author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
---|---|---|
committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /bin/updatedb.sh | |
parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'bin/updatedb.sh')
-rwxr-xr-x | bin/updatedb.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/updatedb.sh b/bin/updatedb.sh index daee6e835..964bc184c 100755 --- a/bin/updatedb.sh +++ b/bin/updatedb.sh @@ -116,7 +116,7 @@ if (empty($version)) { $version = 2012080700; } -$dir = $opts['dir'] . DIRECTORY_SEPARATOR . $DB->db_provider; +$dir = $opts['dir'] . '/' . $DB->db_provider; if (!file_exists($dir)) { rcube::raise_error("DDL Upgrade files for " . $DB->db_provider . " driver not found.", false, true); } @@ -133,7 +133,7 @@ sort($result, SORT_NUMERIC); foreach ($result as $v) { echo "Updating database schema ($v)... "; - $error = update_db_schema($opts['package'], $v, $dir . DIRECTORY_SEPARATOR . "$v.sql"); + $error = update_db_schema($opts['package'], $v, "$dir/$v.sql"); if ($error) { echo "[FAILED]\n"; |