MediaWiki r24298 - Code Review

Index: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
===================================================================
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php	(revision 24297)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php	(revision 24298)
@@ -50,6 +50,7 @@
 
 $wgAutoloadClasses['SyntaxHighlight_GeSHi'] = dirname( __FILE__ ) . '/SyntaxHighlight_GeSHi.class.php';
 $wgHooks['ShowRawCssJs'][] = 'SyntaxHighlight_GeSHi::viewHook';
+$wgHooks['LoadAllMessages'][] = 'SyntaxHighlight_GeSHi::loadMessages';
 $wgExtensionFunctions[] = 'efSyntaxHighlight_GeSHiSetup';
 
 /**
Index: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
===================================================================
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php	(revision 24297)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php	(revision 24298)
@@ -199,15 +199,29 @@
 	 * Initialise messages and ensure the GeSHi class is loaded
 	 */
 	private static function initialise() {
-		global $wgMessageCache;
 		if( !self::$initialised ) {
-			require_once( dirname( __FILE__ ) . '/SyntaxHighlight_GeSHi.i18n.php' );
-			foreach( efSyntaxHighlight_GeSHiMessages() as $lang => $messages )
-				$wgMessageCache->addMessages( $messages, $lang );
+			self::loadMessages();
 			if( !class_exists( 'GeSHi' ) )
 				require( 'geshi/geshi.php' );
 			self::$initialised = true;
 		}
+		return true;
 	}
+	
+	/**
+	 * Load extension messages
+	 *
+	 * @return bool
+	 */
+	public static function loadMessages() {
+		static $done = false;
+		if( !$done ) {
+			global $wgMessageCache;
+			require_once( dirname( __FILE__ ) . '/SyntaxHighlight_GeSHi.i18n.php' );
+			foreach( efSyntaxHighlight_GeSHiMessages() as $lang => $messages )
+				$wgMessageCache->addMessages( $messages, $lang );
+		}
+		return true;
+	}
 
-}
+}
\ No newline at end of file