summaryrefslogtreecommitdiff
path: root/installer/rcube_install.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-26 11:26:58 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-26 11:28:50 +0200
commitae0c133d45fbb95a8266db505033690af46b4363 (patch)
tree99978517f02452e40fee492a372897902d54e0a9 /installer/rcube_install.php
parent23ea51e98df7f1591ff0b788809b4eba784ab27d (diff)
Fix error handling in CLI mode, use STDERR and non-empty exit code (#1489043)
Conflicts: program/lib/Roundcube/rcube.php
Diffstat (limited to 'installer/rcube_install.php')
-rw-r--r--installer/rcube_install.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index b86ccab02..2e1298707 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -637,8 +637,10 @@ class rcube_install
*/
function update_db($version)
{
- system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $version
- . " --dir=" . INSTALL_PATH . "SQL", $result);
+ system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube"
+ . " --version=" . escapeshellarg($version)
+ . " --dir=" . INSTALL_PATH . "SQL"
+ . " 2>&1", $result);
return !$result;
}