equal
deleted
inserted
replaced
258 |
258 |
259 function __construct() |
259 function __construct() |
260 { |
260 { |
261 global $db, $session, $paths, $template, $plugins; // Common objects |
261 global $db, $session, $paths, $template, $plugins; // Common objects |
262 |
262 |
263 if ( defined('IN_ENANO_INSTALL') ) |
263 if ( defined('IN_ENANO_INSTALL') && !defined('IN_ENANO_UPGRADE') ) |
264 { |
264 { |
265 @include(ENANO_ROOT.'/config.new.php'); |
265 @include(ENANO_ROOT.'/config.new.php'); |
266 } |
266 } |
267 else |
267 else |
268 { |
268 { |