http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70046
Revision: 70046
Author: platonides
Date: 2010-07-27 21:11:57 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
Use the frame and set the two hooks in one function.
Modified Paths:
--------------
trunk/extensions/WikiTextLoggedInOut/WikiTextLoggedInOut.php
Modified: trunk/extensions/WikiTextLoggedInOut/WikiTextLoggedInOut.php
===================================================================
--- trunk/extensions/WikiTextLoggedInOut/WikiTextLoggedInOut.php
2010-07-27 21:08:22 UTC (rev 70045)
+++ trunk/extensions/WikiTextLoggedInOut/WikiTextLoggedInOut.php
2010-07-27 21:11:57 UTC (rev 70046)
@@ -19,7 +19,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'WikiTextLoggedInOut',
- 'version' => '1.1',
+ 'version' => '1.2',
'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
'url' => 'http://www.mediawiki.org/wiki/Extension:WikiTextLoggedInOut',
'descriptionmsg' => 'wikitextloggedinout-desc'
@@ -28,35 +28,30 @@
$dir = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['WikiTextLoginInOut'] = $dir .
'WikiTextLoggedInOut.i18n.php';
-$wgHooks['ParserFirstCallInit'][] = 'wfWikiTextLoggedIn';
-function wfWikiTextLoggedIn( &$parser ) {
+$wgHooks['ParserFirstCallInit'][] = 'efWikiTextLoggedInOut';
+function efWikiTextLoggedIn( &$parser ) {
$parser->setHook( 'loggedin', 'OutputLoggedInText' );
+ $parser->setHook( 'loggedout', 'OutputLoggedOutText' );
return true;
}
-function OutputLoggedInText( $input, $args, $parser ) {
+function OutputLoggedInText( $input, $args, $parser, $frame ) {
global $wgUser;
if( $wgUser->isLoggedIn() ) {
- return $parser->recursiveTagParse( $input );
+ return $parser->recursiveTagParse( $input, $frame );
}
return '';
}
-$wgHooks['ParserFirstCallInit'][] = 'wfWikiTextLoggedOut';
-
-function wfWikiTextLoggedOut( &$parser ) {
- $parser->setHook( 'loggedout', 'OutputLoggedOutText' );
- return true;
-}
-
-function OutputLoggedOutText( $input, $args, $parser ) {
+function OutputLoggedOutText( $input, $args, $parser, $frame ) {
global $wgUser;
if( !$wgUser->isLoggedIn() ) {
- return $parser->recursiveTagParse( $input );
+ return $parser->recursiveTagParse( $input, $frame );
}
return '';
}
+
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
