First version of the commandline update script

git-svn-id: https://svn.roundcube.net/trunk@2020 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 1 insertions, 23 deletions

diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index 808994dca..12afc15f7 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -130,7 +130,7 @@ class rcube_install
    */
   function create_config($which, $force = false)
   {
-    $out = file_get_contents("../config/{$which}.inc.php.dist");
+    $out = file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");
     
     if (!$out)
       return '[Warning: could not read the template file]';
@@ -542,25 +542,3 @@ class rcube_install
   
 }
 
-
-/**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
- */
-function Q($string)
-{
-  return htmlentities($string);
-}
-
-
-/**
- * Fake rinternal error handler to catch errors
- */
-function raise_error($p)
-{
-  $rci = rcube_install::get_instance();
-  $rci->raise_error($p);
-}
-