http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95661
Revision: 95661
Author: faurethomas
Date: 2011-08-29 14:15:24 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
fix r87531
Modified Paths:
--------------
trunk/extensions/WikiTweet/WikiTweet.i18n.php
trunk/extensions/WikiTweet/WikiTweet.php
Modified: trunk/extensions/WikiTweet/WikiTweet.i18n.php
===================================================================
--- trunk/extensions/WikiTweet/WikiTweet.i18n.php 2011-08-29 13:41:30 UTC
(rev 95660)
+++ trunk/extensions/WikiTweet/WikiTweet.i18n.php 2011-08-29 14:15:24 UTC
(rev 95661)
@@ -51,6 +51,7 @@
'wikitweet-mailsent' => 'mail sent',
'wikitweet-viaroom' => 'via room',
'wikitweet-alertsolved' => 'one of your alert was resolved in',
+ 'wikitweet-cannotparse' => 'Cannot parse'
);
/** Message documentation (Message documentation)
@@ -245,6 +246,7 @@
'wikitweet-mailsent' => 'mail envoyé',
'wikitweet-viaroom' => 'via room',
'wikitweet-alertsolved' => 'Une de vos alertes a été résolue dans la
salle',
+ 'wikitweet-cannotparse' => 'Ne peux pas être parsé'
);
/** Franco-Provençal (Arpetan)
Modified: trunk/extensions/WikiTweet/WikiTweet.php
===================================================================
--- trunk/extensions/WikiTweet/WikiTweet.php 2011-08-29 13:41:30 UTC (rev
95660)
+++ trunk/extensions/WikiTweet/WikiTweet.php 2011-08-29 14:15:24 UTC (rev
95661)
@@ -28,8 +28,9 @@
}
// Hook up into MediaWiki
-$wgExtensionFunctions[] = 'wikiTweeter';
+//$wgExtensionFunctions[] = 'wikiTweeter';
$wgHooks['LanguageGetMagic'][] = 'wikiTweeterMagic';
+$wgHooks['ParserFirstCallInit'][] = 'wfWikiTweetRegisterHook';
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'WikiTweet',
@@ -41,58 +42,19 @@
$dir = dirname(__FILE__) . '/';
$wgExtensionMessagesFiles['WikiTweet'] = $dir . 'WikiTweet.i18n.php';
-
$wgAutoloadClasses['ApiQueryWikiTweet'] = "$dir/WikiTweet.api.php";
$wgAPIListModules['wikitweet'] = 'ApiQueryWikiTweet';
-
$wgAutoloadClasses['WikiTweetFunctions'] = "$dir/WikiTweet.functions.php";
-function wikiTweeter()
+function wfWikiTweetRegisterHook()
{
- global $wgExtensionMessagesFiles, $wgParser, $wgMessageCache;
- // Set the hooks
- $wgParser->setHook('wiki-tweet', 'wikiTweeterRender');
- $wgParser->setFunctionHook('wiki-tweet', 'wikiTweeterFunction');
- // Set our messages
- $wgMessageCache->addMessages( array('wikiTweeter_cannotparse'=>
'wikiTweeter: Cannot parse parameter: '));
- // loading extension messages
- require_once($wgExtensionMessagesFiles['WikiTweet']);
- $wgMessageCache->addMessagesByLang($messages);
+ global $wgParser;
+ //$wgParser->setHook('wiki-tweet', 'wikiTweeterRender');
+ //$wgParser->setFunctionHook('wiki-tweet', 'wikiTweeterFunction');
+ $wgParser->setHook( 'wiki-tweet', 'wikiTweeterRender' );
+ return true;
}
-// This manipulates the results of the wikiTweeter extension
-// into the same function as the <wiki-tweet> tag.
-function wikiTweeterFunction($parser)
-{
- // Get the arguments
- $fargs = func_get_args();
- $input = array_shift($fargs);
-
- // The first category is required
- $rows = array_shift($fargs);
- $params = array();
- $params["rows"] = $rows;
- $params["donotparse"] = 1;
-
- // Split the rest of the arguments
- foreach ($fargs as $parm)
- {
- // Split it into its components
- $split = split("=", $parm);
- if (!$split[1])
- {
- return htmlspecialchars(wfMsg(
- 'wikiTweeter_cannotparse')
- . $parm);
- }
- // Save it
- $params[$split[0]] = $split[1];
- }
-
- // Return the cloud
- return wikiTweeterRender($input, $params, $parser);
-}
-
// Sets up the magic for the parser functions
function wikiTweeterMagic(&$magicWords, $langCode)
{
@@ -247,12 +209,12 @@
$res5 =
$dbr->update('wikitweet_avatar',array('avatar'=>$avatar),array('user'=>str_replace('
','_',mysql_real_escape_string($user))));
}
}
- $class = ($args["class"]) ? $args["class"] : "wiki-tweets";
- $size = ($args["size"]) ? $args["size"] : "normal" ;
- $rows = ($args["rows"]) ? $args["rows"] : $wgWikiTweet["rows"]
;
- $room = ($args["room"]) ? $args["room"] : "main" ;
+ $class = (isset($args["class"])) ? $args["class"] : "wiki-tweets";
+ $size = (isset($args["size"])) ? $args["size"] : "normal" ;
+ $rows = (isset($args["rows"])) ? $args["rows"] :
$wgWikiTweet["rows"] ;
+ $room = (isset($args["room"])) ? $args["room"] : "main" ;
$allowstatus = (isset($args["status"])) ? true : false ;
- $alertslevel = ($args["alertslevel"]) ? $args["alertslevel"] : "1" ;
+ $alertslevel = (isset($args["alertslevel"])) ? $args["alertslevel"] :
"1" ;
// [GRAPH]
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
