From fee8c6ceab0f66d83e5c62eae44ee7c624847972 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Oct 2008 16:11:32 -0400
Subject: [PATCH] First version of the commandline update script

---
 installer/rcube_install.php |   24 +-----------------------
 1 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 808994d..12afc15 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -130,7 +130,7 @@
    */
   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]';
@@ -540,27 +540,5 @@
     return $out;
   }
   
-}
-
-
-/**
- * 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);
 }
 

--
Gitblit v1.9.1