Commit 230805b6 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes: #2663 Removing smarty2 detection

parent 314bd6db
......@@ -272,12 +272,7 @@ ini_set("report_memleaks", 1);
ini_set("include_path", ".:$BASE_DIR/include:".PHP_DIR.":".PEAR_DIR);
/* Do smarty setup */
if (file_exists(SMARTY)) {
require(SMARTY);
} else {
require(SMARTY3);
}
require(SMARTY);
/*require(SMARTY_PATH);*/
$smarty = new Smarty;
......@@ -286,12 +281,7 @@ $smarty->template_dir = $BASE_DIR.'/ihtml/';
$smarty->caching = FALSE;
$smarty->assign('css_files', array());
// To be able to switch between smarty version 2/3
if (defined('SMARTY_PHP_REMOVE')) {
$smarty->php_handling = SMARTY_PHP_REMOVE;
} else {
$smarty->php_handling = Smarty::PHP_REMOVE;
}
$smarty->php_handling = Smarty::PHP_REMOVE;
/* Check for SSL connection */
$ssl = "";
......
......@@ -61,15 +61,10 @@ define("FPDF","/usr/share/php/fpdf/fpdf.php"); /*! Define fpdf library path */
*/
define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path */
/*!
* \brief Path for smarty libraries
*/
define("SMARTY", "/usr/share/php/smarty/libs/Smarty.class.php"); /*! Define smarty2 library path */
/*!
* \brief Path for smarty3 libraries
*/
define("SMARTY3", "/usr/share/php/smarty3/Smarty.class.php"); /*! Define smarty3 library path */
define("SMARTY", "/usr/share/php/smarty3/Smarty.class.php"); /*! Define smarty3 library path */
/*!
* \brief FusionDirectory Version
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment