diff --git a/app/Module.php b/app/Module.php index fce27b0eb..a22e064ad 100644 --- a/app/Module.php +++ b/app/Module.php @@ -74,7 +74,7 @@ public static function isLicenseActivated($alias, $author_url) public static function isOfficial($author_url) { - return parse_url($author_url, PHP_URL_HOST) == self::getAppUrl(); + return parse_url($author_url, PHP_URL_HOST) == parse_url(\Config::get('app.freescout_url'), PHP_URL_HOST); } /** @@ -167,6 +167,6 @@ public static function deactiveModule($alias, $clear_app_cache = true) */ public static function getAppUrl() { - return parse_url(\Config::get('app.freescout_url'), PHP_URL_HOST); + return parse_url(\Config::get('app.url'), PHP_URL_HOST); } } diff --git a/config/app.php b/config/app.php index 66fe3a091..f3519fd10 100644 --- a/config/app.php +++ b/config/app.php @@ -201,6 +201,7 @@ 'alert_fetch' => ['default' => false], 'alert_fetch_period' => ['default' => 15], // min 'email_branding' => ['default' => true], + 'open_tracking' => ['default' => true], ], /* diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 30aa7e8ef..1f7b25d6c 100755 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -35,10 +35,10 @@ if [ -f "${TOOLS_DIR}/pre_upgrade.sh" ]; then source "${TOOLS_DIR}/pre_upgrade.sh"; fi -if [ -f "${PROJECT_ROOT}/.gitcommit" ]; then - gitcommit=`more "${PROJECT_ROOT}/.gitcommit"` - echo -e "Last commit: \e[32m${gitcommit}\e[0m"; -fi +#if [ -f "${PROJECT_ROOT}/.gitcommit" ]; then +# gitcommit=`more "${PROJECT_ROOT}/.gitcommit"` +# echo -e "Last commit: \e[32m${gitcommit}\e[0m"; +#fi # Check if git is installed git_installed=`command -v git`;