PrivateCoffee/wishthis
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: #108 channel redirection

Browse source
This commit is contained in:
grandeljay 2023-12-17 13:08:29 +01:00
parent d50d4b0aab
commit c6896f91c0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/classes/wishthis/User.php
View file

@ -530,9 +530,9 @@ class User
$this->birthdate = $birthdate;
}
public function getChannel(): string
public function getChannel(): string|null
{
return $this->channel;
return $this->channel ?? null;
}
public function setChannel(string $channel): void

4
src/functions/redirect.php
View file

@ -32,14 +32,14 @@ function redirect(string $target)
if (
defined('CHANNELS')
&& is_array(CHANNELS)
&& isset($user->channel)
&& $user->getChannel()
&& !$isDevEnvironment
) {
$host = null;
foreach (CHANNELS as $channel) {
if (
$channel['branch'] === $user->channel
$channel['branch'] === $user->getChannel()
&& $channel['host'] !== $_SERVER['HTTP_HOST']
&& $isHostInChannel
) {