diff --git a/e107_core/templates/email_template.php b/e107_core/templates/email_template.php index fdd760835..61972402d 100644 --- a/e107_core/templates/email_template.php +++ b/e107_core/templates/email_template.php @@ -171,7 +171,7 @@ $EMAIL_TEMPLATE['default']['header'] = " diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 9df29cad4..9863cfbd0 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -3445,7 +3445,16 @@ class e107 define('ADMINDIR', $ADMIN_DIRECTORY); define('SITEURLBASE', $this->HTTP_SCHEME.'://'.$_SERVER['HTTP_HOST']); - define('SITEURL', SITEURLBASE.e_HTTP); + + if(self::isCli()) + { + define('SITEURL', SITEURLBASE.$_SERVER['DOMAIN'].e_HTTP); + } + else + { + define('SITEURL', SITEURLBASE.e_HTTP); + } + // login/signup define('e_SIGNUP', SITEURL.(file_exists(e_BASE.'customsignup.php') ? 'customsignup.php' : 'signup.php'));