diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
tree | f1fdd326034e05177596851be6a7127615d81498 /skins/Modern/Modern.php | |
parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'skins/Modern/Modern.php')
-rw-r--r-- | skins/Modern/Modern.php | 60 |
1 files changed, 12 insertions, 48 deletions
diff --git a/skins/Modern/Modern.php b/skins/Modern/Modern.php index f1a3ce34..4ba6c476 100644 --- a/skins/Modern/Modern.php +++ b/skins/Modern/Modern.php @@ -1,50 +1,14 @@ <?php -/** - * Modern skin - * - * @file - * @ingroup Skins - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * http://www.gnu.org/copyleft/gpl.html - */ -$wgExtensionCredits['skin'][] = array( - 'path' => __FILE__, - 'name' => 'Modern', - 'namemsg' => 'skinname-modern', - 'descriptionmsg' => 'modern-desc', - 'url' => 'https://www.mediawiki.org/wiki/Skin:Modern', - 'author' => array( 'River Tarnell', '...' ), - 'license-name' => 'GPLv2+', -); - -// Register files -$wgAutoloadClasses['SkinModern'] = __DIR__ . '/SkinModern.php'; -$wgAutoloadClasses['ModernTemplate'] = __DIR__ . '/SkinModern.php'; -$wgMessagesDirs['Modern'] = __DIR__ . '/i18n'; - -// Register skin -$wgValidSkinNames['modern'] = 'Modern'; - -// Register modules -$wgResourceModules['skins.modern'] = array( - 'styles' => array( - 'resources/main.css' => array( 'media' => 'screen' ), - 'resources/print.css' => array( 'media' => 'print' ), - ), - 'remoteBasePath' => $GLOBALS['wgStylePath'] . '/Modern', - 'localBasePath' => __DIR__, -); +if ( function_exists( 'wfLoadSkin' ) ) { + wfLoadSkin( 'Modern' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['Modern'] = __DIR__ . '/i18n'; + /* wfWarn( + 'Deprecated PHP entry point used for Modern skin. Please use wfLoadSkin instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return true; +} else { + die( 'This version of the Modern skin requires MediaWiki 1.25+' ); +} |