X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FSetup.php;h=d7f1189a776e22461b774b9db1aaf5efaa99ac9e;hb=1162ed5f88e5a77ea6feed971813914a95004b4f;hp=f7d8d08829c622d23aa2f1bdad3922ef672b4915;hpb=2379efaad6bddc93e7f08ca42f017890169b44e4;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Setup.php b/includes/Setup.php index f7d8d08829..d7f1189a77 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -119,20 +119,15 @@ if ( $wgRightsIcon ) { ); } -if ( isset( $wgFooterIcons['copyright'] ) - && isset( $wgFooterIcons['copyright']['copyright'] ) +if ( isset( $wgFooterIcons['copyright']['copyright'] ) && $wgFooterIcons['copyright']['copyright'] === [] ) { - if ( $wgCopyrightIcon ) { - $wgFooterIcons['copyright']['copyright'] = $wgCopyrightIcon; - } elseif ( $wgRightsIcon || $wgRightsText ) { + if ( $wgRightsIcon || $wgRightsText ) { $wgFooterIcons['copyright']['copyright'] = [ 'url' => $wgRightsUrl, 'src' => $wgRightsIcon, 'alt' => $wgRightsText, ]; - } else { - unset( $wgFooterIcons['copyright']['copyright'] ); } } @@ -720,7 +715,7 @@ if ( !is_object( $wgAuth ) ) { // Set up the session $ps_session = Profiler::instance()->scopedProfileIn( $fname . '-session' ); /** - * @var MediaWiki\\Session\\SessionId|null $wgInitialSessionId The persistent + * @var MediaWiki\Session\SessionId|null $wgInitialSessionId The persistent * session ID (if any) loaded at startup */ $wgInitialSessionId = null;