Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 73 insertions, 0 deletions

diff --git a/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php b/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php
new file mode 100644
index 00000000..63310c5b
--- /dev/null
+++ b/extensions/SyntaxHighlight_GeSHi/ResourceLoaderGeSHiModule.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * 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
+ */
+
+class ResourceLoaderGeSHiModule extends ResourceLoaderModule {
+
+	/**
+	 * @var string
+	 */
+	protected $lang;
+
+	/**
+	 * @param array $info Module definition.
+	 */
+	function __construct( $info ) {
+		$this->lang = $info['lang'];
+	}
+
+	/**
+	 * @param ResourceLoaderContext $context
+	 * @return array
+	 */
+	public function getStyles( ResourceLoaderContext $context ) {
+		$geshi = SyntaxHighlight_GeSHi::prepare( '', $this->lang );
+		if ( !$geshi->error ) {
+			$css = SyntaxHighlight_GeSHi::getCSS( $geshi );
+		} else {
+			$css = ResourceLoader::makeComment( $geshi->error() );
+		}
+
+		return array( 'all' => $css );
+	}
+
+	/**
+	 * @param ResourceLoaderContext $context
+	 * @return int
+	 */
+	public function getModifiedTime( ResourceLoaderContext $context ) {
+		return max( array(
+			$this->getDefinitionMtime( $context ),
+			self::safeFilemtime( __FILE__ ),
+			self::safeFilemtime( __DIR__ . '/SyntaxHighlight_GeSHi.class.php' ),
+			self::safeFilemtime( __DIR__ . '/geshi/geshi.php' ),
+			self::safeFilemtime( GESHI_LANG_ROOT . "/{$this->lang}.php" ),
+		) );
+	}
+
+	/**
+	 * @param $context ResourceLoaderContext
+	 * @return array
+	 */
+	public function getDefinitionSummary( ResourceLoaderContext $context ) {
+		return array(
+			'class' => get_class( $this ),
+			'lang' => $this->lang,
+		);
+	}
+}