not checked type of return value in \Piwik\Plugin\Manager::deactivateThemeIfTheme

[anonymous-matomo-user]

\Piwik\Plugin\Manager::getThemeEnabled is returning either an object or false, but \Piwik\Plugin\Manager::deactivateThemeIfTheme does not check for false, so there is a condition missing, if there is not theme available the default one should be activated, anyway any error should be avoided

    private function deactivateThemeIfTheme($pluginName)
    {
        // Only one theme enabled at a time
        $themeEnabled = $this->getThemeEnabled();
        if($themeEnabled !== false) {
            if ($themeEnabled->getPluginName() != self::DEFAULT_THEME) {
                $themeAlreadyEnabled = $themeEnabled->getPluginName();

                $plugin = $this->loadPlugin($pluginName);
                if ($plugin->isTheme()) {
                    $this->deactivatePlugin($themeAlreadyEnabled);
                }
            }
        }
    }

PS: I found that bug while upgrading my TYPO3 Integration plugin for TYPO3 ...

[anonymous-matomo-user]

ok, just found out, that this is not the only place where the check is ommitted ..., so the default theme should be applied here

private function deactivateThemeIfTheme($pluginName)
    {
        // Only one theme enabled at a time
        $themeEnabled = $this->getThemeEnabled();
        if($themeEnabled === false) {
            $this->loadPlugin(self::DEFAULT_THEME);
            $this->activatePlugin(self::DEFAULT_THEME);
        } else {
            if ($themeEnabled->getPluginName() != self::DEFAULT_THEME) {
                $themeAlreadyEnabled = $themeEnabled->getPluginName();

                $plugin = $this->loadPlugin($pluginName);
                if ($plugin->isTheme()) {
                    $this->deactivatePlugin($themeAlreadyEnabled);
                }
            }
        }
    }

[mattab]

In fe88778: Fixes #4961 Thanks for the report & patch!

[mattab]

In e0041ed: Refs #4961 Another fix. Let me know if you still see notices/warnings related to this