includes/lang.php
changeset 623 a7a14bc57855
parent 616 e311f5e6f904
child 626 be0e904eec17
equal deleted inserted replaced
622:734af34cd7ad 623:a7a14bc57855
    74   
    74   
    75   function __construct($lang)
    75   function __construct($lang)
    76   {
    76   {
    77     global $db, $session, $paths, $template, $plugins; // Common objects
    77     global $db, $session, $paths, $template, $plugins; // Common objects
    78     
    78     
    79     if ( defined('IN_ENANO_INSTALL') && !defined('ENANO_CONFIG_FETCHED') )
    79     if ( defined('IN_ENANO_INSTALL') && ( !defined('ENANO_CONFIG_FETCHED') || defined('IN_ENANO_UPGRADE') ) )
    80     {
    80     {
    81       // special case for the Enano installer: it will load its own strings from a JSON file and just use this API for fetching
    81       // special case for the Enano installer: it will load its own strings from a JSON file and just use this API for fetching
    82       // and templatizing them.
    82       // and templatizing them.
    83       // 1.1.4 fix: this was still being called after main API startup from installer payload
    83       // 1.1.4 fix: this was still being called after main API startup from installer payload
    84       $this->lang_id   = 1;
    84       $this->lang_id   = 1;