r58311 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r58310‎ \| r58311 \| r58312 >
Date:	13:14, 29 October 2009
Author:	siebrand
Status:	deferred (Comments)
Tags:
Comment:	* Some i18n review and preparations for l10n * stylize.php and trailing/superfluous whitespace removed
Modified paths:	/trunk/extensions/Wikilog/SpecialWikilog.php (modified) (history) /trunk/extensions/Wikilog/Wikilog.i18n.magic.php (modified) (history) /trunk/extensions/Wikilog/Wikilog.i18n.php (modified) (history) /trunk/extensions/Wikilog/Wikilog.php (modified) (history) /trunk/extensions/Wikilog/WikilogComment.php (modified) (history) /trunk/extensions/Wikilog/WikilogCommentsPage.php (modified) (history) /trunk/extensions/Wikilog/WikilogFeed.php (modified) (history) /trunk/extensions/Wikilog/WikilogHooks.php (modified) (history) /trunk/extensions/Wikilog/WikilogItem.php (modified) (history) /trunk/extensions/Wikilog/WikilogItemPage.php (modified) (history) /trunk/extensions/Wikilog/WikilogLinksUpdate.php (modified) (history) /trunk/extensions/Wikilog/WikilogMainPage.php (modified) (history) /trunk/extensions/Wikilog/WikilogPager.php (modified) (history) /trunk/extensions/Wikilog/WikilogParser.php (modified) (history) /trunk/extensions/Wikilog/WikilogQuery.php (modified) (history) /trunk/extensions/Wikilog/WikilogUtils.php (modified) (history) /trunk/extensions/Wikilog/WlCaptchaAdapter.php (modified) (history) /trunk/extensions/Wikilog/WlFeed.body.php (modified) (history) /trunk/extensions/Wikilog/WlFeed.i18n.php (modified) (history) /trunk/extensions/Wikilog/WlFeed.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Wikilog/WikilogFeed.php
—	—	@@ -28,14 +28,12 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Syndication feed driver. Creates feeds from a list of wikilog articles,
35	34	* given a format and a query object.
36	35	*/
37	36	class WikilogFeed
38	37	{
39		-
40	38	/**
41	39	* Feed title (i.e., not Wikilog title). For Special:Wikilog, 'wikilog'
42	40	* system message should be used.
—	—	@@ -143,7 +141,7 @@
144	142	# Try to load the feed from our cache.
145	143	$cached = $this->loadFromCache( $feed->getUpdated(), $timekey, $feedkey );
146	144
147		~~- if( is_string( $cached ) ) {~~
	145	+ if ( is_string( $cached ) ) {
148	146	wfDebug( "Wikilog: Outputting cached feed\n" );
149	147	$feed->httpHeaders();
150	148	echo $cached;
—	—	@@ -394,7 +392,7 @@
395	393	}
396	394	if ( $row->wlw_authors ) {
397	395	$authors = unserialize( $row->wlw_authors );
398		~~- foreach( $authors as $user => $userid ) {~~
	396	+ foreach ( $authors as $user => $userid ) {
399	397	$usertitle = Title::makeTitle( NS_USER, $user );
400	398	$feed->addAuthor( $user, $usertitle->getFullUrl() );
401	399	}
—	—	@@ -439,17 +437,17 @@
440	438	$age = time() - wfTimestamp( TS_UNIX, $tsCache );
441	439
442	440	if ( $age < $wgFeedCacheTimeout ) {
443		~~- wfDebug( "Wikilog: loading feed from cache -- ".~~
444		~~- "too young: age ($age) < timeout ($wgFeedCacheTimeout) ".~~
	441	+ wfDebug( "Wikilog: loading feed from cache -- " .
	442	+ "too young: age ($age) < timeout ($wgFeedCacheTimeout) " .
445	443	"($feedkey; $tsCache; $tsData)\n" );
446	444	return $messageMemc->get( $feedkey );
447	445	} else if ( $tsCache >= $tsData ) {
448		~~- wfDebug( "Wikilog: loading feed from cache -- ".~~
449		~~- "not modified: cache ($tsCache) >= data ($tsData)".~~
	446	+ wfDebug( "Wikilog: loading feed from cache -- " .
	447	+ "not modified: cache ($tsCache) >= data ($tsData)" .
450	448	"($feedkey)\n" );
451	449	return $messageMemc->get( $feedkey );
452	450	} else {
453		~~- wfDebug( "Wikilog: cached feed timestamp check failed -- ".~~
	451	+ wfDebug( "Wikilog: cached feed timestamp check failed -- " .
454	452	"cache ($tsCache) < data ($tsData)\n" );
455	453	}
456	454	}
—	—	@@ -481,7 +479,7 @@
482	480	$wgOut->addWikiMsg( 'feed-unavailable' );
483	481	return false;
484	482	}
485		~~- if( !isset( $wgWikilogFeedClasses[$this->mFormat] ) ) {~~
	483	+ if ( !isset( $wgWikilogFeedClasses[$this->mFormat] ) ) {
486	484	wfHttpError( 500, "Internal Server Error", "Unsupported feed type." );
487	485	return false;
488	486	}
—	—	@@ -535,5 +533,4 @@
536	534	return $title->getFullUrl();
537	535	}
538	536	}
539		-
540	537	}
Index: trunk/extensions/Wikilog/WikilogQuery.php
—	—	@@ -28,27 +28,25 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Wikilog post SQL query driver.
35	34	* This class drives queries for wikilog posts, given the fields to filter.
36	35	*/
37	36	class WikilogItemQuery
38	37	{
39		-
40	38	# Valid filter values for publish status.
41		~~- const PS_ALL = 0; ///< Return all items~~
42		~~- const PS_PUBLISHED = 1; ///< Return only published items~~
43		~~- const PS_DRAFTS = 2; ///< Return only drafts~~
	39	+ const PS_ALL = 0; // /< Return all items
	40	+ const PS_PUBLISHED = 1; // /< Return only published items
	41	+ const PS_DRAFTS = 2; // /< Return only drafts
44	42
45	43	# Local variables.
46		~~- private $mWikilogTitle = NULL; ///< Filter by wikilog.~~
47		~~- private $mPubStatus = self::PS_ALL; ///< Filter by published status.~~
48		~~- private $mCategory = false; ///< Filter by category.~~
49		~~- private $mAuthor = false; ///< Filter by author.~~
50		~~- private $mTag = false; ///< Filter by tag.~~
51		~~- private $mDate = false; ///< Filter by date.~~
52		~~- private $mNeedWikilogParam = false; ///< Need wikilog param in queries.~~
	44	+ private $mWikilogTitle = NULL; // /< Filter by wikilog.
	45	+ private $mPubStatus = self::PS_ALL; // /< Filter by published status.
	46	+ private $mCategory = false; // /< Filter by category.
	47	+ private $mAuthor = false; // /< Filter by author.
	48	+ private $mTag = false; // /< Filter by tag.
	49	+ private $mDate = false; // /< Filter by date.
	50	+ private $mNeedWikilogParam = false; // /< Need wikilog param in queries.
53	51
54	52	# Options
55	53	/** Query options. */
—	—	@@ -66,7 +64,7 @@
67	65
68	66	# If constructed without a title (from Special:Wikilog), it means that
69	67	# the listing is global, and needs wikilog parameter to filter.
70		~~- $this->mNeedWikilogParam = ($wikilogTitle == NULL);~~
	68	+ $this->mNeedWikilogParam = ( $wikilogTitle == NULL );
71	69	}
72	70
73	71	/**
—	—	@@ -150,9 +148,9 @@
151	149	* during the whole month or year.
152	150	*/
153	151	public function setDate( $year, $month = false, $day = false ) {
154		~~- $year = ($year > 0 && $year <= 9999) ? $year : false;~~
155		~~- $month = ($month > 0 && $month <= 12) ? $month : false;~~
156		~~- $day = ($day > 0 && $day <= 31) ? $day : false;~~
	152	+ $year = ( $year > 0 && $year <= 9999 ) ? $year : false;
	153	+ $month = ( $month > 0 && $month <= 12 ) ? $month : false;
	154	+ $day = ( $day > 0 && $day <= 31 ) ? $day : false;
157	155
158	156	if ( $year \|\| $month ) {
159	157	if ( !$year ) {
—	—	@@ -160,13 +158,13 @@
161	159	if ( $month > intval( gmdate( 'n' ) ) ) $year--;
162	160	}
163	161
164		~~- $date_end = str_pad( $year+1, 4, '0', STR_PAD_LEFT );~~
	162	+ $date_end = str_pad( $year + 1, 4, '0', STR_PAD_LEFT );
165	163	$date_start = str_pad( $year, 4, '0', STR_PAD_LEFT );
166	164	if ( $month ) {
167		~~- $date_end = $date_start . str_pad( $month+1, 2, '0', STR_PAD_LEFT );~~
	165	+ $date_end = $date_start . str_pad( $month + 1, 2, '0', STR_PAD_LEFT );
168	166	$date_start = $date_start . str_pad( $month, 2, '0', STR_PAD_LEFT );
169	167	if ( $day ) {
170		~~- $date_end = $date_start . str_pad( $day+1, 2, '0', STR_PAD_LEFT );~~
	168	+ $date_end = $date_start . str_pad( $day + 1, 2, '0', STR_PAD_LEFT );
171	169	$date_start = $date_start . str_pad( $day, 2, '0', STR_PAD_LEFT );
172	170	}
173	171	}
—	—	@@ -247,46 +245,46 @@
248	246
249	247	# Customizations.
250	248
251		~~- ## Filter by wikilog name.~~
	249	+ # # Filter by wikilog name.
252	250	if ( $this->mWikilogTitle !== NULL ) {
253	251	$q_conds['wlp_parent'] = $this->mWikilogTitle->getArticleId();
254	252	}
255	253
256		~~- ## Filter by published status.~~
	254	+ # # Filter by published status.
257	255	if ( $this->mPubStatus === self::PS_PUBLISHED ) {
258	256	$q_conds['wlp_publish'] = 1;
259	257	} else if ( $this->mPubStatus === self::PS_DRAFTS ) {
260	258	$q_conds['wlp_publish'] = 0;
261	259	}
262	260
263		~~- ## Filter by category.~~
	261	+ # # Filter by category.
264	262	if ( $this->mCategory ) {
265	263	$q_tables[] = 'categorylinks';
266	264	$q_joins['categorylinks'] = array( 'JOIN', 'wlp_page = cl_from' );
267	265	$q_conds['cl_to'] = $this->mCategory->getDBkey();
268	266	}
269	267
270		~~- ## Filter by author.~~
	268	+ # # Filter by author.
271	269	if ( $this->mAuthor ) {
272	270	$q_tables[] = 'wikilog_authors';
273	271	$q_joins['wikilog_authors'] = array( 'JOIN', 'wlp_page = wla_page' );
274	272	$q_conds['wla_author_text'] = $this->mAuthor->getDBkey();
275	273	}
276	274
277		~~- ## Filter by tag.~~
	275	+ # # Filter by tag.
278	276	if ( $this->mTag ) {
279	277	$q_tables[] = 'wikilog_tags';
280	278	$q_joins['wikilog_tags'] = array( 'JOIN', 'wlp_page = wlt_page' );
281	279	$q_conds['wlt_tag'] = $this->mTag;
282	280	}
283	281
284		~~- ## Filter by date.~~
	282	+ # # Filter by date.
285	283	if ( $this->mDate ) {
286	284	$q_conds[] = 'wlp_pubdate >= ' . $db->addQuotes( $this->mDate->start );
287	285	$q_conds[] = 'wlp_pubdate < ' . $db->addQuotes( $this->mDate->end );
288	286	}
289	287
290		~~- ## Add last comment timestamp, used in syndication feeds.~~
	288	+ # # Add last comment timestamp, used in syndication feeds.
291	289	if ( $opts['last-comment-timestamp'] ) {
292	290	$q_tables[] = 'wikilog_comments';
293	291	$q_fields[] = 'MAX(wlc_updated) AS _wlp_last_comment_timestamp';
—	—	@@ -363,7 +361,4 @@
364	362	return self::PS_PUBLISHED;
365	363	}
366	364	}
367		-
368	365	}
369		-
370		-
Index: trunk/extensions/Wikilog/WlFeed.body.php
—	—	@@ -28,14 +28,12 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Syndication base class. This class shares common metadata for both feeds
35	34	* (RSS channels) and entries (RSS items).
36	35	*/
37	36	abstract class WlSyndicationBase
38	37	{
39		-
40	38	/**
41	39	* A permanent, universally unique identifier for an entry or feed.
42	40	* Required. Corresponds to atom:id and rss:guid (entries only).
—	—	@@ -146,7 +144,7 @@
147	145	function getLinks( $rel = null ) {
148	146	return is_null( $rel ) ? $this->mLinks : $this->mLinks[$rel];
149	147	}
150		-
	148	+
151	149	function setAuthors( $value ) { $this->mAuthors = $value; }
152	150	function getAuthors() { return $this->mAuthors; }
153	151
—	—	@@ -264,7 +262,6 @@
265	263
266	264	}
267	265
268		-
269	266	/**
270	267	* Syndication feed class. This class represents a feed (Atom) or channel
271	268	* (RSS).
—	—	@@ -272,7 +269,6 @@
273	270	abstract class WlSyndicationFeed
274	271	extends WlSyndicationBase
275	272	{
276		-
277	273	/**
278	274	* A text construct that conveys a human-readable description or subtitle
279	275	* for the feed. Optional. Corresponds to atom:subtitle and rss:description
—	—	@@ -433,7 +429,7 @@
434	430	if ( in_array( 'sniff', $this->mQuirks ) ) {
435	431	echo "<!--\n" . str_repeat( self::QUIRK_SNIFF_STR, 10 ) . "-->\n";
436	432	}
437		-
	433	+
438	434	if ( !in_array( 'style', $this->mQuirks ) ) {
439	435	echo '<?xml-stylesheet type="text/css" href="' .
440	436	htmlspecialchars( wfExpandUrl( "$wgStylePath/common/feed.css?$wgStyleVersion" ) ) .
—	—	@@ -486,10 +482,8 @@
487	483	return NULL;
488	484	}
489	485	}
490		-
491	486	}
492	487
493		-
494	488	/**
495	489	* Syndication entry class. This class represents individual entries (Atom) or
496	490	* items (RSS).
—	—	@@ -497,7 +491,6 @@
498	492	class WlSyndicationEntry
499	493	extends WlSyndicationBase
500	494	{
501		-
502	495	/**
503	496	* A date value indicating an instant in time when the entry was published.
504	497	*/
—	—	@@ -569,18 +562,16 @@
570	563	/@}/
571	564	}
572	565
573		-
574	566	/**
575	567	* A text construct, contains human-readable text and is language-sensitive.
576	568	* May contain plain text, HTML or XHTML.
577	569	*/
578	570	class WlTextConstruct
579	571	{
	572	+ const T_TEXT = 'text'; // /< Plain text, no markup.
	573	+ const T_HTML = 'html'; // /< Contains HTML markup.
	574	+ const T_XHTML = 'xhtml'; // /< Contains XHTML markup.
580	575
581		~~- const T_TEXT = 'text'; ///< Plain text, no markup.~~
582		~~- const T_HTML = 'html'; ///< Contains HTML markup.~~
583		~~- const T_XHTML = 'xhtml'; ///< Contains XHTML markup.~~
584		-
585	576	/**
586	577	* Content language tag.
587	578	*/
—	—	@@ -675,17 +666,14 @@
676	667	}
677	668	return $content;
678	669	}
679		-
680	670	}
681	671
682		-
683	672	/**
684	673	* Atom feed class.
685	674	*/
686	675	class WlAtomFeed
687	676	extends WlSyndicationFeed
688	677	{
689		-
690	678	/**
691	679	* Returns the default content type for Atom feeds.
692	680	*/
—	—	@@ -842,17 +830,14 @@
843	831	function outFooter() {
844	832	echo Xml::closeElement( 'feed' ) . "\n";
845	833	}
846		-
847	834	}
848	835
849		-
850	836	/**
851	837	* RSS feed class.
852	838	*/
853	839	class WlRSSFeed
854	840	extends WlSyndicationFeed
855	841	{
856		-
857	842	/**
858	843	* Returns the default content type for RSS feeds.
859	844	*/
—	—	@@ -935,7 +920,7 @@
936	921	echo Xml::element( 'language', NULL, $this->getLanguage() ) . "\n";
937	922	echo Xml::element( 'lastBuildDate', NULL, $this->formatTime( $this->getUpdated() ) ) . "\n";
938	923	echo $this->formatTextData( 'copyright', $this->getRights() );
939		-
	924	+
940	925	$gtor = $this->getGenerator();
941	926	echo Xml::element( 'generator', NULL, "{$gtor['content']} {$gtor['attribs']['version']}" ) . "\n";
942	927	}
—	—	@@ -1022,7 +1007,7 @@
1023	1008	} else if ( $entry->getContent() ) {
1024	1009	$description = $entry->getContent();
1025	1010	}
1026		-
	1011	+
1027	1012	if ( $description ) {
1028	1013	if ( $description instanceof WlTextConstruct ) {
1029	1014	echo Xml::element( 'description', NULL, $description->getHTML() );
—	—	@@ -1049,14 +1034,11 @@
1050	1035	echo Xml::closeElement( 'channel' ) . "\n";
1051	1036	echo Xml::closeElement( 'rss' ) . "\n";
1052	1037	}
1053		-
1054	1038	}
1055	1039
1056		-
1057	1040	/**
1058	1041	* MediaWiki compatibility classes.
1059	1042	*/
1060		-
1061	1043	class WlFeedItemCompat
1062	1044	extends WlSyndicationEntry
1063	1045	{
Index: trunk/extensions/Wikilog/Wikilog.i18n.magic.php
—	—	@@ -4,9 +4,9 @@
5	5	* @addtogroup Extensions
6	6	*/
7	7
	8	+// FIXME: Use $wgExtensionMessagesFiles[] and $magicWords. See f.e. extension ParserFunctions.
8	9	$words = array();
9	10
10		-
11	11	/**
12	12	* English.
13	13	* @author Juliano F. Ravasi
—	—	@@ -24,7 +24,6 @@
25	25	'wlk-hidden' => array( 0, 'hidden' ),
26	26	);
27	27
28		-
29	28	/**
30	29	* Portuguese.
31	30	* @author Juliano F. Ravasi
—	—	@@ -42,7 +41,6 @@
43	42	'wlk-hidden' => array( 0, 'oculto', 'hidden' ),
44	43	);
45	44
46		-
47	45	/**
48	46	* Brazilian Portuguese.
49	47	* @author Juliano F. Ravasi
—	—	@@ -59,4 +57,3 @@
60	58	'wlk-summary' => array( 1, 'resumo', 'summary' ),
61	59	'wlk-hidden' => array( 0, 'oculto', 'hidden' ),
62	60	);
63		-
Index: trunk/extensions/Wikilog/Wikilog.php
—	—	@@ -28,7 +28,6 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/*
34	33	* General extension information.
35	34	*/
—	—	@@ -41,17 +40,15 @@
42	41	'url' => 'http://www.mediawiki.org/wiki/Extension:Wikilog',
43	42	);
44	43
45		-
46	44	/*
47	45	* Dependencies.
48	46	*/
49		~~-require_once( dirname(__FILE__) . '/WlFeed.php' );~~
	47	+require_once( dirname( __FILE__ ) . '/WlFeed.php' );
50	48
51		-
52	49	/*
53	50	* Messages.
54	51	*/
55		~~-$dir = dirname(__FILE__) . '/';~~
	52	+$dir = dirname( __FILE__ ) . '/';
56	53	$wgExtensionMessagesFiles['Wikilog'] = $dir . 'Wikilog.i18n.php';
57	54
58	55	/*
—	—	@@ -117,7 +114,7 @@
118	115	$wgHooks['LanguageGetSpecialPageAliases'][]
119	116	= 'WikilogHooks::LanguageGetSpecialPageAliases';
120	117	$wgHooks['LanguageGetMagic'][] = 'WikilogHooks::LanguageGetMagic';
121		~~-$wgHooks['LoadExtensionSchemaUpdates'][]= 'WikilogHooks::ExtensionSchemaUpdates';~~
	118	+$wgHooks['LoadExtensionSchemaUpdates'][] = 'WikilogHooks::ExtensionSchemaUpdates';
122	119	$wgHooks['UnknownAction'][] = 'WikilogHooks::UnknownAction';
123	120
124	121	// WikilogLinksUpdate hooks
—	—	@@ -156,7 +153,7 @@
157	154	/*
158	155	* Default settings.
159	156	*/
160		~~-require_once( dirname(__FILE__) . '/WikilogDefaultSettings.php' );~~
	157	+require_once( dirname( __FILE__ ) . '/WikilogDefaultSettings.php' );
161	158
162	159
163	160	/**
—	—	@@ -165,8 +162,8 @@
166	163	*/
167	164	class Wikilog
168	165	{
169		~~- ###~~
170		~~- ## Setup functions.~~
	166	+ # ##
	167	+ # # Setup functions.
171	168	#
172	169
173	170	/**
—	—	@@ -180,12 +177,12 @@
181	178	global $wgExtraNamespaces, $wgWikilogNamespaces;
182	179
183	180	if ( $ns < 100 ) {
184		~~- echo "Wikilog setup: custom namespaces should start ".~~
	181	+ echo "Wikilog setup: custom namespaces should start " .
185	182	"at 100 to avoid conflict with standard namespaces.\n";
186	183	die( 1 );
187	184	}
188		~~- if ( ($ns % 2) != 0 ) {~~
189		~~- echo "Wikilog setup: given namespace ($ns) is not a ".~~
	185	+ if ( ( $ns % 2 ) != 0 ) {
	186	+ echo "Wikilog setup: given namespace ($ns) is not a " .
190	187	"subject namespace (even number).\n";
191	188	die( 1 );
192	189	}
—	—	@@ -197,12 +194,12 @@
198	195	}
199	196
200	197	$wgExtraNamespaces[$ns ] = $name;
201		~~- $wgExtraNamespaces[$ns^1] = $talk;~~
	198	+ $wgExtraNamespaces[$ns ^ 1] = $talk;
202	199	$wgWikilogNamespaces[] = $ns;
203	200	}
204	201
205		~~- ###~~
206		~~- ## MediaWiki hooks.~~
	202	+ # ##
	203	+ # # MediaWiki hooks.
207	204	#
208	205
209	206	/**
—	—	@@ -220,7 +217,7 @@
221	218	# Find assigned namespaces and make sure they have subpages
222	219	foreach ( $wgWikilogNamespaces as $ns ) {
223	220	$wgNamespacesWithSubpages[$ns ] = true;
224		~~- $wgNamespacesWithSubpages[$ns^1] = true;~~
	221	+ $wgNamespacesWithSubpages[$ns ^ 1] = true;
225	222	}
226	223
227	224	# Work around bug in MediaWiki 1.13 when '?action=render'.
—	—	@@ -292,7 +289,7 @@
293	290	if ( $target->isTalkPage() && !in_array( 'known', $options ) ) {
294	291	$wi = self::getWikilogInfo( $target );
295	292	if ( $wi && $wi->isItem() && !$wi->getTrailing() && $wi->getItemTitle()->exists() ) {
296		~~- if ( ($i = array_search( 'broken', $options )) !== false ) {~~
	293	+ if ( ( $i = array_search( 'broken', $options ) ) !== false ) {
297	294	array_splice( $options, $i, 1 );
298	295	}
299	296	$options[] = 'known';
—	—	@@ -312,7 +309,7 @@
313	310	$wi = self::getWikilogInfo( $title );
314	311	if ( $wi && $wi->isItem() && $wi->getItemTitle()->exists() ) {
315	312	$query = '';
316		~~- if ( ($i = array_search( 'new', $classes )) !== false ) {~~
	313	+ if ( ( $i = array_search( 'new', $classes ) ) !== false ) {
317	314	array_splice( $classes, $i, 1 );
318	315	}
319	316	}
—	—	@@ -333,8 +330,8 @@
334	331	$action = $wgRequest->getText( 'action' );
335	332	if ( $wi->isMain() && $skin->mTitle->quickUserCan( 'edit' ) ) {
336	333	$contentActions['wikilog'] = array(
337		~~- 'class' => ($action == 'wikilog') ? 'selected' : false,~~
338		~~- 'text' => wfMsg('wikilog-tab'),~~
	334	+ 'class' => ( $action == 'wikilog' ) ? 'selected' : false,
	335	+ 'text' => wfMsg( 'wikilog-tab' ),
339	336	'href' => $skin->mTitle->getLocalUrl( 'action=wikilog' )
340	337	);
341	338	}
—	—	@@ -347,8 +344,8 @@
348	345	return true;
349	346	}
350	347
351		~~- ###~~
352		~~- ## Other global wikilog functions.~~
	348	+ # ##
	349	+ # # Other global wikilog functions.
353	350	#
354	351
355	352	/**
—	—	@@ -369,10 +366,8 @@
370	367	return NULL;
371	368	}
372	369	}
373		-
374	370	}
375	371
376		-
377	372	/**
378	373	* Wikilog information class.
379	374	* This class represents relationship information about a wikilog article,
—	—	@@ -381,14 +376,14 @@
382	377	*/
383	378	class WikilogInfo
384	379	{
385		~~- public $mWikilogName; ///< Wikilog title (textual string).~~
386		~~- public $mWikilogTitle; ///< Wikilog main article title object.~~
387		~~- public $mItemName; ///< Wikilog post title (textual string).~~
388		~~- public $mItemTitle; ///< Wikilog post title object.~~
389		~~- public $mItemTalkTitle; ///< Wikilog post talk title object.~~
	380	+ public $mWikilogName; // /< Wikilog title (textual string).
	381	+ public $mWikilogTitle; // /< Wikilog main article title object.
	382	+ public $mItemName; // /< Wikilog post title (textual string).
	383	+ public $mItemTitle; // /< Wikilog post title object.
	384	+ public $mItemTalkTitle; // /< Wikilog post talk title object.
390	385
391		~~- public $mIsTalk; ///< Constructed using a talk page title.~~
392		~~- public $mTrailing = NULL; ///< Trailing subpage title.~~
	386	+ public $mIsTalk; // /< Constructed using a talk page title.
	387	+ public $mTrailing = NULL; // /< Trailing subpage title.
393	388
394	389	/**
395	390	* Constructor.
—	—	@@ -436,10 +431,8 @@
437	432	function getItemTalkTitle() { return $this->mItemTitle->getTalkPage(); }
438	433
439	434	function getTrailing() { return $this->mTrailing; }
440		-
441	435	}
442	436
443		-
444	437	/**
445	438	* Interface used by article derived classes that implement the "wikilog"
446	439	* action handler. That is, pages that can be called with ?action=wikilog.
—	—	@@ -448,4 +441,3 @@
449	442	{
450	443	public function wikilog();
451	444	}
452		-
Index: trunk/extensions/Wikilog/WlFeed.php
—	—	@@ -28,25 +28,23 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/*
34	33	* General extension information.
35	34	*/
36	35	$wgExtensionCredits['other'][] = array(
37		~~- 'name' => 'WlFeed',~~
38		~~- 'version' => '1.0.0',~~
39		~~- 'author' => 'Juliano F. Ravasi',~~
40		~~- 'description' => 'Enhanced feed generation classes.',~~
41		~~- 'descriptionmsg' => 'wlfeed-desc',~~
42		~~- 'url' => 'http://www.mediawiki.org/wiki/Extension:Wikilog',~~
	36	+ 'name' => 'WlFeed',
	37	+ 'version' => '1.0.0',
	38	+ 'author' => 'Juliano F. Ravasi',
	39	+ 'description' => 'Enhanced feed generation classes.',
	40	+ 'descriptionmsg' => 'wlfeed-desc',
	41	+ 'url' => 'http://www.mediawiki.org/wiki/Extension:Wikilog',
43	42	);
44	43
45		-
46	44	/*
47	45	* Module autoload information.
48	46	*/
49	47
50		~~-$dir = dirname(__FILE__) . '/';~~
	48	+$dir = dirname( __FILE__ ) . '/';
51	49
52	50	$wgExtensionMessagesFiles['WlFeed'] = $dir . 'WlFeed.i18n.php';
53	51
—	—	@@ -62,7 +60,6 @@
63	61	'WlRSSFeedCompat' => $dir . 'WlFeed.body.php'
64	62	);
65	63
66		-
67	64	/*
68	65	* Extension setup.
69	66	*/
—	—	@@ -110,5 +107,4 @@
111	108	}
112	109	}
113	110	}
114		-
115	111	}
Index: trunk/extensions/Wikilog/SpecialWikilog.php
—	—	@@ -28,7 +28,6 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Special:Wikilog special page.
35	34	* The primary function of this special page is to list all wikilog articles
—	—	@@ -40,7 +39,6 @@
41	40	class SpecialWikilog
42	41	extends IncludableSpecialPage
43	42	{
44		-
45	43	/** Alternate views. */
46	44	protected static $views = array( 'summary', 'archives' );
47	45
—	—	@@ -52,7 +50,7 @@
53	51	*/
54	52	function __construct( ) {
55	53	parent::__construct( 'Wikilog' );
56		~~- wfLoadExtensionMessages('Wikilog');~~
	54	+ wfLoadExtensionMessages( 'Wikilog' );
57	55	}
58	56
59	57	/**
—	—	@@ -311,7 +309,7 @@
312	310
313	311	$align = $wgContLang->isRtl() ? 'left' : 'right';
314	312	$fields = self::getQueryFormFields( $opts );
315		~~- $columns = array_chunk( $fields, (count( $fields ) + 1) / 2, true );~~
	313	+ $columns = array_chunk( $fields, ( count( $fields ) + 1 ) / 2, true );
316	314
317	315	$out = Xml::openElement( 'table', array( 'width' => '100%' ) ) .
318	316	Xml::openElement( 'tr' );
—	—	@@ -434,5 +432,4 @@
435	433	return false;
436	434	}
437	435	}
438		-
439	436	}
Index: trunk/extensions/Wikilog/WlCaptchaAdapter.php
—	—	@@ -28,7 +28,6 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Singleton class that provides an interface to Captchas implemented
35	34	* through the ConfirmEdit extension. Only Captchas derived from
—	—	@@ -36,7 +35,6 @@
37	36	*/
38	37	class WlCaptcha
39	38	{
40		-
41	39	public static $instance = NULL;
42	40	public static $initialized = false;
43	41
—	—	@@ -49,8 +47,8 @@
50	48	self::$instance = new WlCaptchaAdapter( $captcha );
51	49	} else {
52	50	$classname = get_class( $captcha );
53		~~- trigger_error( "Only captchas derived from SimpleCaptcha ".~~
54		~~- "are compatible with Wikilog. The current captcha, ".~~
	51	+ trigger_error( "Only captchas derived from SimpleCaptcha " .
	52	+ "are compatible with Wikilog. The current captcha, " .
55	53	"{$classname}, isn't compatible.", E_USER_WARNING );
56	54	}
57	55	}
—	—	@@ -78,7 +76,6 @@
79	77
80	78	}
81	79
82		-
83	80	/**
84	81	* Adapter for SimpleCaptcha derived classes.
85	82	*
—	—	@@ -91,7 +88,6 @@
92	89	*/
93	90	class WlCaptchaAdapter
94	91	{
95		-
96	92	public $mCaptcha;
97	93
98	94	public function __construct( &$captcha ) {
—	—	@@ -103,7 +99,7 @@
104	100	}
105	101
106	102	private function doConfirmEdit( $title, $newText, $oldText = NULL ) {
107		~~- if( $this->shouldCheck( $title, $newText, $oldText ) ) {~~
	103	+ if ( $this->shouldCheck( $title, $newText, $oldText ) ) {
108	104	return $this->mCaptcha->passCaptcha();
109	105	} else {
110	106	wfDebug( "WlCaptchaAdapter: no need to show captcha.\n" );
—	—	@@ -115,12 +111,12 @@
116	112	global $wgUser, $wgCaptchaWhitelistIP, $wgCaptchaRegexes;
117	113	global $wgEmailAuthentication, $ceAllowConfirmedEmail;
118	114
119		~~- if( $wgUser->isAllowed( 'skipcaptcha' ) ) {~~
	115	+ if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
120	116	wfDebug( "WlCaptchaAdapter: user group allows skipping captcha\n" );
121	117	return false;
122	118	}
123	119
124		~~- if( !empty( $wgCaptchaWhitelistIP ) ) {~~
	120	+ if ( !empty( $wgCaptchaWhitelistIP ) ) {
125	121	$ip = wfGetIp();
126	122	foreach ( $wgCaptchaWhitelistIP as $range ) {
127	123	if ( IP::isInRange( $ip, $range ) ) {
—	—	@@ -129,13 +125,13 @@
130	126	}
131	127	}
132	128
133		~~- if( $wgEmailAuthentication && $ceAllowConfirmedEmail &&~~
	129	+ if ( $wgEmailAuthentication && $ceAllowConfirmedEmail &&
134	130	$wgUser->isEmailConfirmed() ) {
135	131	wfDebug( "WlCaptchaAdapter: user has confirmed mail, skipping captcha\n" );
136	132	return false;
137	133	}
138	134
139		~~- if( $this->captchaTriggers( $title, 'edit' ) ) {~~
	135	+ if ( $this->captchaTriggers( $title, 'edit' ) ) {
140	136	$this->mCaptcha->trigger = sprintf( "Edit trigger by '%s' at [[%s]]",
141	137	$wgUser->getName(), $title->getPrefixedText() );
142	138	$this->mCaptcha->action = 'edit';
—	—	@@ -143,7 +139,7 @@
144	140	return true;
145	141	}
146	142
147		~~- if( $this->captchaTriggers( $title, 'create' ) && is_null( $oldText ) ) {~~
	143	+ if ( $this->captchaTriggers( $title, 'create' ) && is_null( $oldText ) ) {
148	144	$this->mCaptcha->trigger = sprintf( "Create trigger by '%s' at [[%s]]",
149	145	$wgUser->getName(), $title->getPrefixedText() );
150	146	$this->mCaptcha->action = 'create';
—	—	@@ -151,13 +147,13 @@
152	148	return true;
153	149	}
154	150
155		~~- if( $this->captchaTriggers( $title, 'addurl' ) ) {~~
	151	+ if ( $this->captchaTriggers( $title, 'addurl' ) ) {
156	152	$oldLinks = $this->findLinks( $title, $oldText );
157	153	$newLinks = $this->findLinks( $title, $newText );
158	154	$unknownLinks = array_filter( $newLinks, array( &$this->mCaptcha, 'filterLink' ) );
159	155	$addedLinks = array_diff( $unknownLinks, $oldLinks );
160	156	$numLinks = count( $addedLinks );
161		~~- if( $numLinks > 0 ) {~~
	157	+ if ( $numLinks > 0 ) {
162	158	$this->mCaptcha->trigger = sprintf( "%dx url trigger by '%s' at [[%s]]: %s",
163	159	$numLinks, $wgUser->getName(), $title->getPrefixedText(),
164	160	implode( ", ", $addedLinks ) );
—	—	@@ -166,15 +162,15 @@
167	163	}
168	164	}
169	165
170		~~- if( !empty( $wgCaptchaRegexes ) ) {~~
171		~~- foreach( $wgCaptchaRegexes as $regex ) {~~
	166	+ if ( !empty( $wgCaptchaRegexes ) ) {
	167	+ foreach ( $wgCaptchaRegexes as $regex ) {
172	168	$newMatches = array();
173		~~- if( preg_match_all( $regex, $newtext, $newMatches ) ) {~~
	169	+ if ( preg_match_all( $regex, $newtext, $newMatches ) ) {
174	170	$oldMatches = array();
175	171	preg_match_all( $regex, $oldtext, $oldMatches );
176	172	$addedMatches = array_diff( $newMatches[0], $oldMatches[0] );
177	173	$numHits = count( $addedMatches );
178		~~- if( $numHits > 0 ) {~~
	174	+ if ( $numHits > 0 ) {
179	175	$this->mCaptcha->trigger = sprintf( "%dx %s trigger by '%s' at [[%s]]: %s",
180	176	$numHits, $regex, $wgUser->getName(), $title->getPrefixedText(),
181	177	implode( ", ", $addedMatches ) );
—	—	@@ -209,11 +205,9 @@
210	206
211	207	public function getCaptchaForm() {
212	208	global $wgOut;
213		~~- return '<div class="captcha">'.~~
214		~~- $wgOut->parse( $this->mCaptcha->getMessage( $this->mCaptcha->action ) ).~~
215		~~- $this->mCaptcha->getForm().~~
	209	+ return '<div class="captcha">' .
	210	+ $wgOut->parse( $this->mCaptcha->getMessage( $this->mCaptcha->action ) ) .
	211	+ $this->mCaptcha->getForm() .
216	212	'</div>';
217	213	}
218		-
219	214	}
220		-
Index: trunk/extensions/Wikilog/WikilogMainPage.php
—	—	@@ -28,12 +28,10 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	class WikilogMainPage
34	33	extends Article
35	34	implements WikilogCustomAction
36	35	{
37		-
38	36	/**
39	37	* Alternate views.
40	38	*/
—	—	@@ -337,6 +335,4 @@
338	336	public static function getWikilogDataFromId( $dbr, $id ) {
339	337	return self::getWikilogData( $dbr, array( 'wlw_page' => $id ) );
340	338	}
341		-
342	339	}
343		-
Index: trunk/extensions/Wikilog/WikilogCommentsPage.php
—	—	@@ -28,7 +28,6 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Wikilog comments namespace handler class.
35	34	*
—	—	@@ -48,17 +47,17 @@
49	48	extends Article
50	49	implements WikilogCustomAction
51	50	{
52		~~- protected $mSkin; ///< Skin used for rendering the page.~~
53		~~- protected $mFormOptions; ///< Post comment form fields.~~
54		~~- protected $mUserCanPost; ///< User is allowed to post.~~
55		~~- protected $mUserCanModerate; ///< User is allowed to moderate.~~
56		~~- protected $mPostedComment; ///< Posted comment, from HTTP post data.~~
57		~~- protected $mCaptchaForm; ///< Captcha form fields, when saving comment.~~
58		~~- protected $mTrailing; ///< Trailing text in comments title page.~~
	51	+ protected $mSkin; // /< Skin used for rendering the page.
	52	+ protected $mFormOptions; // /< Post comment form fields.
	53	+ protected $mUserCanPost; // /< User is allowed to post.
	54	+ protected $mUserCanModerate; // /< User is allowed to moderate.
	55	+ protected $mPostedComment; // /< Posted comment, from HTTP post data.
	56	+ protected $mCaptchaForm; // /< Captcha form fields, when saving comment.
	57	+ protected $mTrailing; // /< Trailing text in comments title page.
59	58
60		~~- public $mItem; ///< Wikilog item the page is associated with.~~
61		~~- public $mTalkTitle; ///< Main talk page title.~~
62		~~- public $mSingleComment; ///< Used when viewing a single comment.~~
	59	+ public $mItem; // /< Wikilog item the page is associated with.
	60	+ public $mTalkTitle; // /< Main talk page title.
	61	+ public $mSingleComment; // /< Used when viewing a single comment.
63	62
64	63	/**
65	64	* Constructor.
—	—	@@ -224,7 +223,7 @@
225	224	}
226	225
227	226	# Initialize a session, when an anonymous post a comment...
228		~~- if( session_id() == '' ) {~~
	227	+ if ( session_id() == '' ) {
229	228	wfSetupSession();
230	229	}
231	230
—	—	@@ -292,12 +291,12 @@
293	292	$html = Xml::openElement( 'div', array( 'class' => 'wl-threads' ) );
294	293
295	294	foreach ( $comments as $comment ) {
296		~~- while ( $top > 0 && $comment->mParent != $stack[$top-1] ) {~~
	295	+ while ( $top > 0 && $comment->mParent != $stack[$top - 1] ) {
297	296	$html .= Xml::closeElement( 'div' );
298	297	array_pop( $stack ); $top--;
299	298	}
300	299
301		~~- $html .= Xml::openElement( 'div', array( 'class' => 'wl-thread' ) ).~~
	300	+ $html .= Xml::openElement( 'div', array( 'class' => 'wl-thread' ) ) .
302	301	$this->formatComment( $comment );
303	302
304	303	if ( $comment->mID == $replyTo && $this->mUserCanPost ) {
—	—	@@ -351,7 +350,7 @@
352	351	$meta = $this->formatCommentMetadata( $comment );
353	352	$text = $wgOut->parse( $comment->getText() ); // TODO: Optimize this.
354	353	$html =
355		~~- Xml::tags( 'div', array( 'class' => 'wl-comment-meta' ), $meta ).~~
	354	+ Xml::tags( 'div', array( 'class' => 'wl-comment-meta' ), $meta ) .
356	355	Xml::tags( 'div', array( 'class' => 'wl-comment-text' ), $text );
357	356	}
358	357
—	—	@@ -368,13 +367,13 @@
369	368	if ( $comment->mUserID ) {
370	369	$by = wfMsgExt( 'wikilog-comment-by-user',
371	370	array( 'parseinline', 'replaceafter' ),
372		~~- $this->mSkin->userLink( $comment->mUserID, $comment->mUserText ),~~
	371	+ '<span class="wl-comment-author">' . $this->mSkin->userLink( $comment->mUserID, $comment->mUserText ) . '</span>',
373	372	$this->mSkin->userTalkLink( $comment->mUserID, $comment->mUserText )
374	373	);
375	374	} else {
376	375	$by = wfMsgExt( 'wikilog-comment-by-anon',
377	376	array( 'parseinline', 'replaceafter' ),
378		~~- $this->mSkin->userLink( $comment->mUserID, $comment->mUserText ),~~
	377	+ '<span class="wl-comment-author">' . $this->mSkin->userLink( $comment->mUserID, $comment->mUserText ) . '</span>',
379	378	$this->mSkin->userTalkLink( $comment->mUserID, $comment->mUserText ),
380	379	htmlspecialchars( $comment->mAnonName )
381	380	);
—	—	@@ -500,7 +499,7 @@
501	500	$opts = $this->mFormOptions;
502	501
503	502	$preview = '';
504		~~- if ( $comment && $comment->mParent == $parent) {~~
	503	+ if ( $comment && $comment->mParent == $parent ) {
505	504	$check = $this->validateComment( $comment );
506	505	if ( $check ) {
507	506	$preview = Xml::wrapClass( wfMsg( $check ), 'mw-warning', 'div' );
—	—	@@ -512,9 +511,9 @@
513	512	}
514	513
515	514	$form =
516		~~- Xml::hidden( 'title', $this->getTitle()->getPrefixedText() ).~~
517		~~- Xml::hidden( 'action', 'wikilog' ).~~
518		~~- Xml::hidden( 'wpEditToken', $wgUser->editToken() ).~~
	515	+ Xml::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
	516	+ Xml::hidden( 'action', 'wikilog' ) .
	517	+ Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
519	518	( $parent ? Xml::hidden( 'wlParent', $parent ) : '' );
520	519
521	520	$fields = array();
—	—	@@ -532,7 +531,7 @@
533	532	$fields[] = array(
534	533	Xml::label( wfMsg( 'wikilog-form-name' ), 'wl-name' ),
535	534	Xml::input( 'wlAnonName', 25, $opts->consumeValue( 'wlAnonName' ),
536		~~- array( 'id' => 'wl-name', 'maxlength' => 255 ) ).~~
	535	+ array( 'id' => 'wl-name', 'maxlength' => 255 ) ) .
537	536	"<p>{$message}</p>"
538	537	);
539	538	}
—	—	@@ -552,7 +551,7 @@
553	552	}
554	553
555	554	$fields[] = array( '',
556		~~- Xml::submitbutton( wfMsg( 'wikilog-submit' ), array( 'name' => 'wlActionCommentSubmit' ) ) .' '.~~
	555	+ Xml::submitbutton( wfMsg( 'wikilog-submit' ), array( 'name' => 'wlActionCommentSubmit' ) ) . ' ' .
557	556	Xml::submitbutton( wfMsg( 'wikilog-preview' ), array( 'name' => 'wlActionCommentPreview' ) )
558	557	);
559	558
—	—	@@ -704,5 +703,4 @@
705	704
706	705	return false;
707	706	}
708		-
709	707	}
Index: trunk/extensions/Wikilog/WikilogHooks.php
—	—	@@ -28,13 +28,11 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* General wikilog hooks.
35	34	*/
36	35	class WikilogHooks
37	36	{
38		-
39	37	/**
40	38	* ArticleEditUpdates hook handler function.
41	39	* Performs post-edit updates if article is a wikilog article.
—	—	@@ -194,7 +192,7 @@
195	193	if ( $oldwl && $newwl ) {
196	194	# Moving title between wikilog namespaces.
197	195	# Update wikilog data.
198		~~- wfDebug( __METHOD__ . ": Moving title between wikilog namespaces ".~~
	196	+ wfDebug( __METHOD__ . ": Moving title between wikilog namespaces " .
199	197	"($oldns, $newns). Updating wikilog data.\n" );
200	198
201	199	$wi = Wikilog::getWikilogInfo( $newtitle );
—	—	@@ -210,14 +208,14 @@
211	209	} else if ( $newwl ) {
212	210	# Moving from normal namespace to wikilog namespace.
213	211	# Create wikilog data.
214		~~- wfDebug( __METHOD__ . ": Moving from another namespace to wikilog ".~~
	212	+ wfDebug( __METHOD__ . ": Moving from another namespace to wikilog " .
215	213	"namespace ($oldns, $newns). Creating wikilog data.\n" );
216	214	# FIXME: This needs a reparse of the wiki text in order to
217	215	# populate wikilog metadata. Or forbid this action.
218	216	} else if ( $oldwl ) {
219	217	# Moving from wikilog namespace to normal namespace.
220	218	# Purge wikilog data.
221		~~- wfDebug( __METHOD__ . ": Moving from wikilog namespace to another ".~~
	219	+ wfDebug( __METHOD__ . ": Moving from wikilog namespace to another " .
222	220	"namespace ($oldns, $newns). Purging wikilog data.\n" );
223	221	$dbw = wfGetDB( DB_MASTER );
224	222	$dbw->delete( 'wikilog_wikilogs', array( 'wlw_page' => $pageid ) );
—	—	@@ -265,14 +263,14 @@
266	264	static function ExtensionSchemaUpdates() {
267	265	global $wgDBtype, $wgExtNewFields, $wgExtPGNewFields, $wgExtNewIndexes, $wgExtNewTables;
268	266
269		~~- $dir = dirname(__FILE__) . '/';~~
	267	+ $dir = dirname( __FILE__ ) . '/';
270	268
271		~~- if( $wgDBtype == 'mysql' ) {~~
	269	+ if ( $wgDBtype == 'mysql' ) {
272	270	$wgExtNewTables[] = array( "wikilog_wikilogs", "{$dir}wikilog-tables.sql" );
273	271	} else {
274		~~- /// TODO: PostgreSQL, SQLite, etc...~~
275		~~- print "\n".~~
276		~~- "Warning: There are no table structures for the Wikilog\n".~~
	272	+ // / TODO: PostgreSQL, SQLite, etc...
	273	+ print "\n" .
	274	+ "Warning: There are no table structures for the Wikilog\n" .
277	275	"extension other than for MySQL at this moment.\n\n";
278	276	}
279	277	return true;
—	—	@@ -289,5 +287,4 @@
290	288	}
291	289	return true;
292	290	}
293		-
294	291	}
Index: trunk/extensions/Wikilog/WikilogLinksUpdate.php
—	—	@@ -28,10 +28,8 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	class WikilogLinksUpdate
34	33	{
35		-
36	34	private $mId;
37	35	private $mTitle;
38	36	private $mDb;
—	—	@@ -104,7 +102,7 @@
105	103	private function getAuthorInsertions( $existing = array() ) {
106	104	$arr = array();
107	105	$diffs = array_diff_key( $this->mAuthors, $existing );
108		~~- foreach( $diffs as $author_text => $author ) {~~
	106	+ foreach ( $diffs as $author_text => $author ) {
109	107	$arr[] = array(
110	108	'wla_page' => $this->mId,
111	109	'wla_author' => $author,
—	—	@@ -117,7 +115,7 @@
118	116	private function getTagInsertions( $existing = array() ) {
119	117	$arr = array();
120	118	$diffs = array_diff_key( $this->mTags, $existing );
121		~~- foreach( $diffs as $tag => $dummy ) {~~
	119	+ foreach ( $diffs as $tag => $dummy ) {
122	120	$arr[] = array(
123	121	'wlt_page' => $this->mId,
124	122	'wlt_tag' => $tag
—	—	@@ -157,10 +155,10 @@
158	156	}
159	157
160	158
161		~~- ###~~
162		~~- ## MediaWiki hooks.~~
	159	+ /**
	160	+ * MediaWiki hooks.
	161	+ */
163	162	#
164		-
165	163	static function LinksUpdate( &$lupd ) {
166	164	if ( isset( $lupd->mParserOutput->mExtWikilog ) ) {
167	165	$u = new WikilogLinksUpdate( $lupd, $lupd->mParserOutput->mExtWikilog );
—	—	@@ -168,6 +166,4 @@
169	167	}
170	168	return true;
171	169	}
172		-
173	170	}
174		-
Index: trunk/extensions/Wikilog/WikilogItemPage.php
—	—	@@ -28,7 +28,6 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Wikilog article namespace handler class.
35	34	*
—	—	@@ -38,7 +37,6 @@
39	38	class WikilogItemPage
40	39	extends Article
41	40	{
42		-
43	41	/**
44	42	* Wikilog article item object.
45	43	*/
—	—	@@ -82,7 +80,7 @@
83	81
84	82	# Display draft notice.
85	83	if ( !$this->mItem->getIsPublished() ) {
86		~~- $wgOut->addHtml( wfMsgWikiHtml( 'wikilog-reading-draft' ) );~~
	84	+ $wgOut->wrapWikiMsg( '<div class="mw-warning">$1</div>', array( 'wikilog-reading-draft' ) );
87	85	}
88	86
89	87	# Item page header.
—	—	@@ -130,7 +128,7 @@
131	129	# Add feed links.
132	130	$links = array();
133	131	if ( $wgFeed ) {
134		~~- foreach( $wgWikilogFeedClasses as $format => $class ) {~~
	132	+ foreach ( $wgWikilogFeedClasses as $format => $class ) {
135	133	$wgOut->addLink( array(
136	134	'rel' => 'alternate',
137	135	'type' => "application/{$format}+xml",
—	—	@@ -188,6 +186,4 @@
189	187
190	188	return parent::preSaveTransform( $text );
191	189	}
192		-
193	190	}
194		-
Index: trunk/extensions/Wikilog/WikilogParser.php
—	—	@@ -28,14 +28,12 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* This class holds the parser functions that hooks into the Parser in order
35	34	* to collect Wikilog metadata.
36	35	*/
37	36	class WikilogParser
38	37	{
39		-
40	38	/**
41	39	* True if parsing articles with feed output specific settings.
42	40	* This is an horrible hack needed because of many MediaWiki misdesigns.
—	—	@@ -138,14 +136,13 @@
139	137	global $wgServer;
140	138	if ( self::$expandingUrls ) {
141	139	$l = strlen( $wgServer );
142		~~- if ( substr( $url, 0, 2*$l ) == $wgServer.$wgServer ) {~~
	140	+ if ( substr( $url, 0, 2 * $l ) == $wgServer . $wgServer ) {
143	141	$url = substr( $url, $l );
144	142	}
145	143	}
146	144	return true;
147	145	}
148	146
149		-
150	147	###
151	148	## Parser tags and functions
152	149	#
—	—	@@ -308,7 +305,6 @@
309	306	}
310	307	}
311	308
312		-
313	309	###
314	310	## Wikilog parser settings.
315	311	#
—	—	@@ -529,10 +525,8 @@
530	526	return NULL;
531	527	}
532	528	}
533		-
534	529	}
535	530
536		-
537	531	/**
538	532	* Wikilog parser output. This class is first attached to the Parser as
539	533	* $parser->mExtWikilog, and then copied to the parser output
—	—	@@ -540,7 +534,6 @@
541	535	*/
542	536	class WikilogParserOutput
543	537	{
544		-
545	538	/* Item and Wikilog metadata */
546	539	public $mSummary = false;
547	540	public $mAuthors = array();
—	—	@@ -557,10 +550,8 @@
558	551	/* Acessor functions, lacking... */
559	552	public function getAuthors() { return $this->mAuthors; }
560	553	public function getTags() { return $this->mTags; }
561		-
562	554	}
563	555
564		-
565	556	/**
566	557	* Since wikilog parses articles with specific options in order to be
567	558	* rendered in feeds, it is necessary to store these parsed outputs in
—	—	@@ -571,7 +562,6 @@
572	563	class WikilogParserCache
573	564	extends ParserCache
574	565	{
575		-
576	566	public static function &singleton() {
577	567	static $instance;
578	568	if ( !isset( $instance ) ) {
—	—	@@ -582,7 +572,7 @@
583	573	}
584	574
585	575	public function getKey( &$article, $popts ) {
586		~~- if( $popts instanceof User ) // API change in MediaWiki 1.15.~~
	576	+ if ( $popts instanceof User ) // API change in MediaWiki 1.15.
587	577	$popts = ParserOptions::newFromUser( $popts );
588	578
589	579	$user = $popts->mUser;
—	—	@@ -591,5 +581,4 @@
592	582	$key = wfMemcKey( 'wlcache', 'idhash', "$pageid-$hash" );
593	583	return $key;
594	584	}
595		-
596	585	}
Index: trunk/extensions/Wikilog/Wikilog.i18n.php
—	—	@@ -12,532 +12,407 @@
13	13	*/
14	14	$messages['en'] = array(
15	15	# Extension information
16		~~- 'wikilog-desc' => 'Adds blogging features, creating a wiki-blog hybrid.',~~
17		~~- 'wikilog-auto' => 'Wikilog Auto', # reserved username~~
18		~~- 'right-wl-postcomment' => 'Post comments to wikilog articles',~~
19		~~- 'right-wl-moderation' => 'Moderation of wikilog article comments',~~
	16	+ 'wikilog-desc' => 'Adds blogging features, creating a wiki-blog hybrid',
	17	+ 'wikilog-auto' => 'Wikilog Auto', # reserved username
	18	+ 'right-wl-postcomment' => 'Post comments to wikilog articles',
	19	+ 'right-wl-moderation' => 'Moderation of wikilog article comments',
20	20
21	21	# Special:Wikilog
22		~~- 'wikilog' => 'Wikilogs', # Page title~~
23		~~- 'wikilog-specialwikilog' => 'Wikilog', # Special page name~~
	22	+ 'wikilog' => 'Wikilogs', # Page title
	23	+ 'wikilog-specialwikilog' => 'Wikilog', # Special page name
24	24
25	25	# Logs
26		~~- 'wikilog-log-pagename' => 'Wikilog actions log',~~
27		~~- 'wikilog-log-pagetext' => 'Below is a list of wikilog actions.',~~
28		~~- 'wikilog-log-cmt-approve' => 'approved comment [[$1]]',~~
29		~~- 'wikilog-log-cmt-reject' => 'rejected comment [[$1]]',~~
30		~~- 'wikilog-log-cmt-rejdel' => 'Rejected wikilog comment from [[Special:Contributions/$1\|$1]]',~~
	26	+ 'wikilog-log-pagename' => 'Wikilog actions log',
	27	+ 'wikilog-log-pagetext' => 'Below is a list of wikilog actions.',
	28	+ 'wikilog-log-cmt-approve' => 'approved comment [[$1]]',
	29	+ 'wikilog-log-cmt-reject' => 'rejected comment [[$1]]',
	30	+ 'wikilog-log-cmt-rejdel' => 'Rejected wikilog comment from [[Special:Contributions/$1\|$1]]',
31	31
32	32	# Wikilog tab
33		~~- 'wikilog-tab' => 'Wikilog',~~
34		~~- 'wikilog-tab-title' => 'Wikilog actions',~~
35		~~- 'wikilog-information' => 'Wikilog information',~~
36		~~- 'wikilog-post-count-published' =>~~
37		~~- 'There are $1 published {{PLURAL:$1\|article\|articles}} in this wikilog,',~~
38		~~- 'wikilog-post-count-drafts' =>~~
39		~~- 'plus $1 unpublished (draft) {{PLURAL:$1\|article\|articles}},',~~
40		~~- 'wikilog-post-count-all' =>~~
41		~~- 'for a total of $1 {{PLURAL:$1\|article\|articles}}.',~~
42		~~- 'wikilog-new-item' => 'Create new wikilog article',~~
43		~~- 'wikilog-new-item-go' => 'Create',~~
44		~~- 'wikilog-item-name' => 'Article name:',~~
	33	+ 'wikilog-tab' => 'Wikilog',
	34	+ 'wikilog-tab-title' => 'Wikilog actions',
	35	+ 'wikilog-information' => 'Wikilog information',
	36	+ 'wikilog-post-count-published' => 'There {{PLURAL:$1\|is one published article\|are $1 published articles}} in this wikilog,',
	37	+ 'wikilog-post-count-drafts' => 'There {{PLURAL:$1\|is one unpublished (draft) article\|are $1 unpublished (draft) articles}},',
	38	+ 'wikilog-post-count-all' => 'In total there {{PLURAL:$1\|is one article\|are $1 articles}}.',
	39	+ 'wikilog-new-item' => 'Create new wikilog article',
	40	+ 'wikilog-new-item-go' => 'Create',
	41	+ 'wikilog-item-name' => 'Article name:',
45	42
46	43	# Generic strings
47		~~- 'wikilog-published' => 'Published',~~
48		~~- 'wikilog-updated' => 'Updated',~~
49		~~- 'wikilog-draft' => 'Draft',~~
50		~~- 'wikilog-authors' => 'Authors',~~
51		~~- 'wikilog-wikilog' => 'Wikilog',~~
52		~~- 'wikilog-title' => 'Title',~~
53		~~- 'wikilog-actions' => 'Actions',~~
54		~~- 'wikilog-comments' => 'Comments',~~
55		~~- 'wikilog-replies' => 'Replies',~~
56		~~- 'wikilog-view-archives' => 'Archives',~~
57		~~- 'wikilog-view-summary' => 'Summary',~~
58		~~- 'wikilog-draft-title-mark' => '(draft)',~~
59		~~- 'wikilog-anonymous-mark' => '(anonymous)',~~
	44	+ 'wikilog-published' => 'Published',
	45	+ 'wikilog-updated' => 'Updated',
	46	+ 'wikilog-draft' => 'Draft',
	47	+ 'wikilog-authors' => 'Authors',
	48	+ 'wikilog-wikilog' => 'Wikilog',
	49	+ 'wikilog-title' => 'Title',
	50	+ 'wikilog-actions' => 'Actions',
	51	+ 'wikilog-comments' => 'Comments',
	52	+ 'wikilog-replies' => 'Replies',
	53	+ 'wikilog-view-archives' => 'Archives',
	54	+ 'wikilog-view-summary' => 'Summary',
	55	+ 'wikilog-draft-title-mark' => '(draft)',
	56	+ 'wikilog-anonymous-mark' => '(anonymous)',
60	57
61	58	# Pager strings
62		~~- 'wikilog-pager-newer-n' => '← newer $1', # $1 = number of items~~
63		~~- 'wikilog-pager-older-n' => 'older $1 →', # $1 = number of items~~
64		~~- 'wikilog-pager-newest' => '←← newest',~~
65		~~- 'wikilog-pager-oldest' => 'oldest →→',~~
66		~~- 'wikilog-pager-prev' => '← previous',~~
67		~~- 'wikilog-pager-next' => 'next →',~~
68		~~- 'wikilog-pager-first' => '←← first',~~
69		~~- 'wikilog-pager-last' => 'last →→',~~
70		~~- 'wikilog-pager-empty' =>~~
71		~~- '<div class="wl-empty">(no items)</div>',~~
	59	+ 'wikilog-pager-newer-n' => '← newer $1', # $1 = number of items
	60	+ 'wikilog-pager-older-n' => 'older $1 →', # $1 = number of items
	61	+ 'wikilog-pager-newest' => '←← newest',
	62	+ 'wikilog-pager-oldest' => 'oldest →→',
	63	+ 'wikilog-pager-prev' => '← previous',
	64	+ 'wikilog-pager-next' => 'next →',
	65	+ 'wikilog-pager-first' => '←← first',
	66	+ 'wikilog-pager-last' => 'last →→',
	67	+ 'wikilog-pager-empty' => '(no items)',
72	68
73	69	# Comments page link text
74		~~- 'wikilog-no-comments' => 'no comments',~~
75		~~- 'wikilog-has-comments' => '{{PLURAL:$1\|one comment\|$1 comments}}',~~
	70	+ 'wikilog-no-comments' => 'no comments',
	71	+ 'wikilog-has-comments' => '{{PLURAL:$1\|one comment\|$1 comments}}',
76	72
77	73	# Wikilog item header and footer
78	74	# $1 = Wikilog URL, $2 = Wikilog Name, $3 = Item URL, $4 = Item Title
79	75	# $5 = Authors, $6 = Publish date, $7 = Comments link
80		~~- 'wikilog-item-brief-header' => ': <i><small>by $5, from [[$1\|$2]], $6, $7.</small></i>',~~
81		~~- 'wikilog-item-brief-footer' => '',~~
82		~~- 'wikilog-item-more' => '[[$3\|→ continue reading...]]',~~
83		~~- 'wikilog-item-sub' => '',~~
84		~~- 'wikilog-item-header' => '',~~
85		~~- 'wikilog-item-footer' => ': <i>— $5 • $6 • $7</i>',~~
	76	+ 'wikilog-item-brief-header' => ': <i><small>by $5, from [[$1\|$2]], $6, $7.</small></i>',
	77	+ 'wikilog-item-brief-footer' => '',
	78	+ 'wikilog-item-more' => '[[$3\|→ continue reading...]]',
	79	+ 'wikilog-item-sub' => '',
	80	+ 'wikilog-item-header' => '',
	81	+ 'wikilog-item-footer' => ': <i>— $5 • $6 • $7</i>',
86	82
87		~~- 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|talk]])',~~
	83	+ 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|talk]])',
88	84
89	85	# Comments
90		~~- 'wikilog-comment-by-user' => 'Comment by <span class="wl-comment-author">$1</span> ($2)',~~
91		~~- 'wikilog-comment-by-anon' => 'Comment by <span class="wl-comment-author">$3</span> (anonymous)',~~
92		~~- 'wikilog-comment-pending' => 'This comment is awaiting approval.',~~
93		~~- 'wikilog-comment-deleted' => 'This comment was deleted.',~~
94		~~- 'wikilog-comment-edited' => 'This comment was last edited on $1 ($2).', # $1 = date and time, $2 = history link~~
95		~~- 'wikilog-comment-autosumm' => 'New comment by $1: $2',~~
96		~~- 'wikilog-reply-to-comment' => 'Post a reply to this comment',~~
97		~~- 'wikilog-comment-page' => 'Go to this comment\'s page',~~
98		~~- 'wikilog-comment-edit' => 'Edit this comment',~~
99		~~- 'wikilog-comment-delete' => 'Delete this comment',~~
100		~~- 'wikilog-comment-history' => 'View comment history',~~
101		~~- 'wikilog-comment-approve' => 'Approve this comment (immediate action)',~~
102		~~- 'wikilog-comment-reject' => 'Reject this comment (immediate action)',~~
103		~~- 'wikilog-newtalk-text' => '<!-- blank page created by Wikilog -->',~~
104		~~- 'wikilog-newtalk-summary' => 'created automatically by wikilog',~~
	86	+ 'wikilog-comment-by-user' => 'Comment by $1 ($2)',
	87	+ 'wikilog-comment-by-anon' => 'Comment by $3 (anonymous)',
	88	+ 'wikilog-comment-pending' => 'This comment is awaiting approval.',
	89	+ 'wikilog-comment-deleted' => 'This comment was deleted.',
	90	+ 'wikilog-comment-edited' => 'This comment was last edited on $1 ($2).', # $1 = date and time, $2 = history link
	91	+ 'wikilog-comment-autosumm' => 'New comment by $1: $2',
	92	+ 'wikilog-reply-to-comment' => 'Post a reply to this comment',
	93	+ 'wikilog-comment-page' => "Go to this comment's page",
	94	+ 'wikilog-comment-edit' => 'Edit this comment',
	95	+ 'wikilog-comment-delete' => 'Delete this comment',
	96	+ 'wikilog-comment-history' => 'View comment history',
	97	+ 'wikilog-comment-approve' => 'Approve this comment (immediate action)',
	98	+ 'wikilog-comment-reject' => 'Reject this comment (immediate action)',
	99	+ 'wikilog-newtalk-text' => '<!-- blank page created by Wikilog -->',
	100	+ 'wikilog-newtalk-summary' => 'created automatically by wikilog',
105	101
106	102	# Atom and RSS feeds
107		~~- 'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 = content language~~
108		~~- 'wikilog-feed-description' => 'Read the most recent posts in this feed.',~~
	103	+ 'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 = content language
	104	+ 'wikilog-feed-description' => 'Read the most recent posts in this feed.',
109	105
110	106	# Item and comments page titles
111		~~- 'wikilog-title-item-full' => '$1 - $2', #1 = article title, $2 wikilog title~~
112		~~- 'wikilog-title-comments' => 'Comments - $1', #1 = article title~~
	107	+ 'wikilog-title-item-full' => '$1 - $2', # 1 = article title, $2 wikilog title
	108	+ 'wikilog-title-comments' => 'Comments - $1', # 1 = article title
113	109
114	110	# Warning and error messages
115		~~- 'wikilog-error-msg' => 'Wikilog: $1',~~
116		~~- 'wikilog-error-title' => 'Wikilog error',~~
117		~~- 'wikilog-invalid-param' => 'Invalid parameter: $1.',~~
118		~~- 'wikilog-invalid-author' => 'Invalid author: $1.',~~
119		~~- 'wikilog-invalid-date' => 'Invalid date: $1.',~~
120		~~- 'wikilog-invalid-tag' => 'Invalid tag: $1.',~~
121		~~- 'wikilog-invalid-file' => 'Invalid file: $1.',~~
122		~~- 'wikilog-file-not-found' => 'Non-existing file: $1.',~~
123		~~- 'wikilog-not-an-image' => 'File is not an image: $1.',~~
124		~~- 'wikilog-out-of-context' =>~~
125		~~- 'Warning: Wikilog tags are being used out of context. ' .~~
126		~~- 'They should only be used in articles in the Wikilog namespace.',~~
127		~~- 'wikilog-too-many-authors' =>~~
128		~~- 'Warning: Too many authors listed in this wikilog post.',~~
129		~~- 'wikilog-too-many-tags' =>~~
130		~~- 'Warning: Too many tags listed in this wikilog post.',~~
131		~~- 'wikilog-comment-is-empty' =>~~
132		~~- 'Posted comment is blank.',~~
133		~~- 'wikilog-comment-too-long' =>~~
134		~~- 'Posted comment is too long.',~~
135		~~- 'wikilog-comment-invalid-name' =>~~
136		~~- 'Provided name is invalid.',~~
137		~~- 'wikilog-no-such-article' =>~~
138		~~- 'The requested wikilog article does not exist.',~~
	111	+ 'wikilog-error-msg' => 'Wikilog: $1',
	112	+ 'wikilog-error-title' => 'Wikilog error',
	113	+ 'wikilog-invalid-param' => 'Invalid parameter: $1.',
	114	+ 'wikilog-invalid-author' => 'Invalid author: $1.',
	115	+ 'wikilog-invalid-date' => 'Invalid date: $1.',
	116	+ 'wikilog-invalid-tag' => 'Invalid tag: $1.',
	117	+ 'wikilog-invalid-file' => 'Invalid file: $1.',
	118	+ 'wikilog-file-not-found' => 'Non-existing file: $1.',
	119	+ 'wikilog-not-an-image' => 'File is not an image: $1.',
	120	+ 'wikilog-out-of-context' => 'Warning: Wikilog tags are being used out of context.
	121	+They should only be used in articles in the Wikilog namespace.',
	122	+ 'wikilog-too-many-authors' => 'Warning: Too many authors listed in this wikilog post.',
	123	+ 'wikilog-too-many-tags' => 'Warning: Too many tags listed in this wikilog post.',
	124	+ 'wikilog-comment-is-empty' => 'Posted comment is blank.',
	125	+ 'wikilog-comment-too-long' => 'Posted comment is too long.',
	126	+ 'wikilog-comment-invalid-name' => 'Provided name is invalid.',
	127	+ 'wikilog-no-such-article' => 'The requested wikilog article does not exist.',
139	128
140		~~- 'wikilog-reading-draft' =>~~
141		~~- '<div class="mw-warning">'.~~
142		~~- '<p>This wikilog article is a draft, it was not published yet.</p>'.~~
143		~~- '</div>',~~
	129	+ 'wikilog-reading-draft' => 'This wikilog article is a draft, it was not published yet.',
144	130
145		~~- 'wikilog-posting-anonymously' => # $1 = "login" link~~
146		~~- 'You are currently not logged in; your comment will be posted '.~~
147		~~- 'anonymously, identified by your Internet connection address. '.~~
148		~~- 'You should either provide a pseudonym above to identify your '.~~
149		~~- 'comment or $1 for it to be properly attributed.',~~
150		~~- 'wikilog-anonymous-moderated' =>~~
151		~~- 'After you submit your comment, it will not be immediately '.~~
152		~~- 'visible on this page. The comment will only appear after it '.~~
153		~~- 'is reviewed by a moderator.',~~
	131	+ 'wikilog-posting-anonymously' => 'You are currently not logged in;
	132	+your comment will be posted anonymously, identified by your Internet connection address.
	133	+You should either provide a pseudonym above to identify your comment or $1 for it to be properly attributed.', # $1 = "login" link
	134	+ 'wikilog-anonymous-moderated' => 'After you submit your comment, it will not be immediately visible on this page.
	135	+The comment will only appear after it is reviewed by a moderator.',
154	136
155	137	# Forms
156		~~- 'wikilog-post-comment' => 'Post a new comment',~~
157		~~- 'wikilog-post-reply' => 'Post a new reply',~~
158		~~- 'wikilog-form-legend' => 'Search for wikilog posts',~~
159		~~- 'wikilog-form-wikilog' => 'Wikilog:',~~
160		~~- 'wikilog-form-category' => 'Category:',~~
161		~~- 'wikilog-form-name' => 'Name:',~~
162		~~- 'wikilog-form-author' => 'Author:',~~
163		~~- 'wikilog-form-tag' => 'Tag:',~~
164		~~- 'wikilog-form-date' => 'Date:',~~
165		~~- 'wikilog-form-status' => 'Status:',~~
166		~~- 'wikilog-form-preview' => 'Preview:',~~
167		~~- 'wikilog-form-comment' => 'Comment:',~~
168		~~- 'wikilog-show-all' => 'All posts',~~
169		~~- 'wikilog-show-published' => 'Published',~~
170		~~- 'wikilog-show-drafts' => 'Drafts',~~
171		~~- 'wikilog-submit' => 'Submit',~~
172		~~- 'wikilog-preview' => 'Preview', # verb~~
173		~~- 'wikilog-edit-lc' => 'edit', # verb~~
174		~~- 'wikilog-reply-lc' => 'reply', # verb~~
175		~~- 'wikilog-delete-lc' => 'delete', # verb~~
176		~~- 'wikilog-approve-lc' => 'approve', # verb~~
177		~~- 'wikilog-reject-lc' => 'reject', # verb~~
178		~~- 'wikilog-page-lc' => 'page', # noun~~
179		~~- 'wikilog-history-lc' => 'history', # noun~~
	138	+ 'wikilog-post-comment' => 'Post a new comment',
	139	+ 'wikilog-post-reply' => 'Post a new reply',
	140	+ 'wikilog-form-legend' => 'Search for wikilog posts',
	141	+ 'wikilog-form-wikilog' => 'Wikilog:',
	142	+ 'wikilog-form-category' => 'Category:',
	143	+ 'wikilog-form-name' => 'Name:',
	144	+ 'wikilog-form-author' => 'Author:',
	145	+ 'wikilog-form-tag' => 'Tag:',
	146	+ 'wikilog-form-date' => 'Date:',
	147	+ 'wikilog-form-status' => 'Status:',
	148	+ 'wikilog-form-preview' => 'Preview:',
	149	+ 'wikilog-form-comment' => 'Comment:',
	150	+ 'wikilog-show-all' => 'All posts',
	151	+ 'wikilog-show-published' => 'Published',
	152	+ 'wikilog-show-drafts' => 'Drafts',
	153	+ 'wikilog-submit' => 'Submit',
	154	+ 'wikilog-preview' => 'Preview', # verb
	155	+ 'wikilog-edit-lc' => 'edit', # verb
	156	+ 'wikilog-reply-lc' => 'reply', # verb
	157	+ 'wikilog-delete-lc' => 'delete', # verb
	158	+ 'wikilog-approve-lc' => 'approve', # verb
	159	+ 'wikilog-reject-lc' => 'reject', # verb
	160	+ 'wikilog-page-lc' => 'page', # noun
	161	+ 'wikilog-history-lc' => 'history', # noun
180	162
181	163	# Other
182	164	'wikilog-doc-import-comment' => "Imported Wikilog documentation",
183	165
184	166	# Untranslatable strings
185		~~- 'wikilog-summary' => '', # Special page summary~~
186		~~- 'wikilog-backlink' => '← $1',~~
187		~~- 'wikilog-brackets' => '[$1]',~~
188		~~- 'wikilog-navigation-bar' =>~~
189		~~- '<div class="$6 visualClear">'.~~
190		~~- '<div style="float:left">$1 • $2</div>'.~~
191		~~- '<div style="float:right">$3 • $4</div>'.~~
192		~~- '<div style="text-align:center">$5</div>'.~~
	167	+ 'wikilog-summary' => '', # Special page summary
	168	+ 'wikilog-backlink' => '← $1',
	169	+ 'wikilog-brackets' => '[$1]',
	170	+ 'wikilog-navigation-bar' =>
	171	+ '<div class="$6 visualClear">' .
	172	+ '<div style="float:left">$1 • $2</div>' .
	173	+ '<div style="float:right">$3 • $4</div>' .
	174	+ '<div style="text-align:center">$5</div>' .
193	175	'</div>',
194	176	);
195	177
196		~~-/** Portuguese (Português)~~
197		~~- * @author Juliano F. Ravasi~~
198		~~- */~~
199		~~-$messages['pt'] = array(~~
200		~~- # Extension information~~
201		~~- 'wikilog-desc' => 'Adiciona recursos de blog, criando um híbrido wiki-blog.',~~
202		~~- 'wikilog-auto' => 'Wikilog Auto', # reserved username~~
203		~~- 'right-wl-postcomment' => 'Postar comentários em artigos wikilog',~~
204		~~- 'right-wl-moderation' => 'Moderação de comentários de artigos wikilog',~~
205		-
206		~~- # Special:Wikilog~~
207		~~- 'wikilog' => 'Wikilogs',~~
208		~~- 'wikilog-specialwikilog' => 'Wikilog',~~
209		-
210		~~- # Logs~~
211		~~- 'wikilog-log-pagename' => 'Registro de ações wikilog',~~
212		~~- 'wikilog-log-pagetext' => 'Abaixo está uma lista das ações wikilog.',~~
213		~~- 'wikilog-log-cmt-approve' => 'aprovou o comentário [[$1]]',~~
214		~~- 'wikilog-log-cmt-reject' => 'rejeitou o comentário [[$1]]',~~
215		~~- 'wikilog-log-cmt-rejdel' => 'Comentário wikilog de [[Special:Contributions/$1\|$1]] rejeitado',~~
216		-
217		~~- # Wikilog tab~~
218		~~- 'wikilog-tab' => 'Wikilog',~~
219		~~- 'wikilog-tab-title' => 'Ações wikilog',~~
220		~~- 'wikilog-information' => 'Informações do wikilog',~~
221		~~- 'wikilog-post-count-published' =>~~
222		~~- 'Há $1 {{PLURAL:$1\|artigo publicado\|artigos publicados}} neste wikilog,',~~
223		~~- 'wikilog-post-count-drafts' =>~~
224		~~- 'mais $1 {{PLURAL:$1\|artigo não-publicado (rascunho)\|artigos não-publicados (rascunhos)}},',~~
225		~~- 'wikilog-post-count-all' =>~~
226		~~- 'para um total de $1 {{PLURAL:$1\|artigo\|artigos}}.',~~
227		~~- 'wikilog-new-item' => 'Criar novo artigo wikilog',~~
228		~~- 'wikilog-new-item-go' => 'Criar',~~
229		~~- 'wikilog-item-name' => 'Nome do artigo:',~~
230		-
231		~~- # Generic strings~~
232		~~- 'wikilog-published' => 'Publicado',~~
233		~~- 'wikilog-updated' => 'Atualizado',~~
234		~~- 'wikilog-draft' => 'Rascunho',~~
235		~~- 'wikilog-authors' => 'Autores',~~
236		~~- 'wikilog-wikilog' => 'Wikilog',~~
237		~~- 'wikilog-title' => 'Título',~~
238		~~- 'wikilog-actions' => 'Ações',~~
239		~~- 'wikilog-comments' => 'Comentários',~~
240		~~- 'wikilog-replies' => 'Respostas',~~
241		~~- 'wikilog-view-archives' => 'Arquivos',~~
242		~~- 'wikilog-view-summary' => 'Resumo',~~
243		~~- 'wikilog-draft-title-mark' => '(rascunho)',~~
244		~~- 'wikilog-anonymous-mark' => '(anônimo)',~~
245		-
246		~~- # Pager strings~~
247		~~- 'wikilog-pager-newer-n' => '← $1 próximos', # $1 = number of items~~
248		~~- 'wikilog-pager-older-n' => '$1 anteriores →', # $1 = number of items~~
249		~~- 'wikilog-pager-newest' => '←← mais recentes',~~
250		~~- 'wikilog-pager-oldest' => 'mais antigos →→',~~
251		~~- 'wikilog-pager-prev' => '← anterior',~~
252		~~- 'wikilog-pager-next' => 'próxima →',~~
253		~~- 'wikilog-pager-first' => '←← primeira',~~
254		~~- 'wikilog-pager-last' => 'última →→',~~
255		~~- 'wikilog-pager-empty' =>~~
256		~~- '<div class="wl-empty">(não há itens)</div>',~~
257		-
258		~~- # Comments page link text~~
259		~~- 'wikilog-no-comments' => 'não há comentários',~~
260		~~- 'wikilog-has-comments' => '{{PLURAL:$1\|um comentário\|$1 comentários}}',~~
261		-
262		~~- # Wikilog item header and footer~~
263		~~- 'wikilog-item-brief-header' => ': <i><small>por $5, em [[$1\|$2]], $6, $7.</small></i>',~~
264		~~- 'wikilog-item-brief-footer' => '',~~
265		~~- 'wikilog-item-more' => '[[$3\|→ continuar lendo...]]',~~
266		~~- 'wikilog-item-sub' => '',~~
267		~~- 'wikilog-item-header' => '',~~
268		~~- 'wikilog-item-footer' => ': <i>— $5 • $6 • $7</i>',~~
269		-
270		~~- 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|discussão]])',~~
271		-
272		~~- # Comments~~
273		~~- 'wikilog-comment-by-user' => 'Comentário por <span class="wl-comment-author">$1</span> ($2)',~~
274		~~- 'wikilog-comment-by-anon' => 'Comentário por <span class="wl-comment-author">$3</span> (anônimo)',~~
275		~~- 'wikilog-comment-pending' => 'Este comentário está aguardando aprovação.',~~
276		~~- 'wikilog-comment-deleted' => 'Este comentário foi apagado.',~~
277		~~- 'wikilog-comment-edited' => 'Este comentário foi editado pela última vez em $1 ($2).', # $1 = date and time, $2 = history link~~
278		~~- 'wikilog-comment-autosumm' => 'Novo comentário por $1: $2',~~
279		~~- 'wikilog-reply-to-comment' => 'Postar uma resposta a esse comentário',~~
280		~~- 'wikilog-comment-page' => 'Ir para a página deste comentário',~~
281		~~- 'wikilog-comment-edit' => 'Editar este comentário',~~
282		~~- 'wikilog-comment-delete' => 'Apagar este comentário',~~
283		~~- 'wikilog-comment-history' => 'Ver histórico do comentário',~~
284		~~- 'wikilog-comment-approve' => 'Aprovar este comentário (ação imediata)',~~
285		~~- 'wikilog-comment-reject' => 'Rejeitar este comentário (ação imediata)',~~
286		~~- 'wikilog-newtalk-text' => '<!-- página em branco criada pelo Wikilog -->',~~
287		~~- 'wikilog-newtalk-summary' => 'criado automaticamente pelo wikilog',~~
288		-
289		~~- # Atom and RSS feeds~~
290		~~- 'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 = content language~~
291		~~- 'wikilog-feed-description' => 'Leia as postagens mais recentes neste feed.',~~
292		-
293		~~- # Item and comments page titles~~
294		~~- 'wikilog-title-item-full' => '$1 - $2', #1 = article title, $2 wikilog title~~
295		~~- 'wikilog-title-comments' => 'Comentários - $1', #1 = article title~~
296		-
297		~~- # Warning and error messages~~
298		~~- 'wikilog-error-msg' => 'Wikilog: $1',~~
299		~~- 'wikilog-invalid-param' => 'Parâmetro inválido: $1.',~~
300		~~- 'wikilog-invalid-author' => 'Autor inválido: $1.',~~
301		~~- 'wikilog-invalid-date' => 'Data inválida: $1.',~~
302		~~- 'wikilog-invalid-tag' => 'Rótulo inválido: $1.',~~
303		~~- 'wikilog-invalid-file' => 'Arquivo inválido: $1.',~~
304		~~- 'wikilog-file-not-found' => 'Arquivo não-existente: $1.',~~
305		~~- 'wikilog-not-an-image' => 'Arquivo não é uma imagem: $1.',~~
306		~~- 'wikilog-out-of-context' =>~~
307		~~- 'Aviso: Rótulos wikilog estão sendo utilizados fora de contexto. ' .~~
308		~~- 'Eles devem ser usados apenas em artigos no espaço de nomes do Wikilog.',~~
309		~~- 'wikilog-too-many-authors' =>~~
310		~~- 'Aviso: Autores demais listados nesta postagem wikilog.',~~
311		~~- 'wikilog-too-many-tags' =>~~
312		~~- 'Aviso: Rótulos demais listados nesta postagem wikilog.',~~
313		~~- 'wikilog-comment-is-empty' =>~~
314		~~- 'O comentário postado está em branco.',~~
315		~~- 'wikilog-comment-too-long' =>~~
316		~~- 'O comentário postado é muito longo.',~~
317		~~- 'wikilog-comment-invalid-name' =>~~
318		~~- 'O nome fornecido é inválido.',~~
319		~~- 'wikilog-no-such-article' =>~~
320		~~- 'O artigo wikilog solicitado não existe.',~~
321		-
322		~~- 'wikilog-reading-draft' =>~~
323		~~- '<div class="mw-warning">'.~~
324		~~- '<p>Este artigo wikilog é um rascunho, ainda não foi publicado.</p>'.~~
325		~~- '</div>',~~
326		-
327		~~- 'wikilog-posting-anonymously' => # $1 = "login" link~~
328		~~- 'Você não está autenticado neste momento; seu comentário será '.~~
329		~~- 'postado anonimamente, identificado pelo endereço de sua conexão '.~~
330		~~- 'Internet. Você deve fornecer um pseudônimo acima para '.~~
331		~~- 'identificar seu comentário ou $1 para que ele seja creditado '.~~
332		~~- 'apropriadamente.',~~
333		-
334		~~- 'wikilog-posting-anonymously' =>~~
335		~~- "Seu comentário será postado anonimamente. Você pode " .~~
336		~~- "$1 para que seu comentário seja identificado.",~~
337		~~- 'wikilog-anonymous-moderated' =>~~
338		~~- 'Após submeter seu comentário, este não será imediatamente '.~~
339		~~- 'visível nesta página. O comentário somente aparecerá após ser '.~~
340		~~- 'revisado por um moderador.',~~
341		-
342		~~- # Forms~~
343		~~- 'wikilog-post-comment' => 'Postar um novo comentário',~~
344		~~- 'wikilog-post-reply' => 'Postar uma nova resposta',~~
345		~~- 'wikilog-form-legend' => 'Procurar por postagens wikilog',~~
346		~~- 'wikilog-form-wikilog' => 'Wikilog:',~~
347		~~- 'wikilog-form-category' => 'Categoria:',~~
348		~~- 'wikilog-form-name' => 'Nome:',~~
349		~~- 'wikilog-form-author' => 'Autor:',~~
350		~~- 'wikilog-form-tag' => 'Rótulo:',~~
351		~~- 'wikilog-form-date' => 'Data:',~~
352		~~- 'wikilog-form-status' => 'Estado:',~~
353		~~- 'wikilog-form-preview' => 'Previsão:',~~
354		~~- 'wikilog-form-comment' => 'Comentário:',~~
355		~~- 'wikilog-show-all' => 'Todas as postagens',~~
356		~~- 'wikilog-show-published' => 'Publicados',~~
357		~~- 'wikilog-show-drafts' => 'Rascunhos',~~
358		~~- 'wikilog-submit' => 'Submeter',~~
359		~~- 'wikilog-preview' => 'Previsão', # verb~~
360		~~- 'wikilog-edit-lc' => 'editar', # verb~~
361		~~- 'wikilog-reply-lc' => 'responder', # verb~~
362		~~- 'wikilog-delete-lc' => 'apagar', # verb~~
363		~~- 'wikilog-approve-lc' => 'aprovar', # verb~~
364		~~- 'wikilog-reject-lc' => 'rejeitar', # verb~~
365		~~- 'wikilog-page-lc' => 'página', # noun~~
366		~~- 'wikilog-history-lc' => 'histórico', # noun~~
367		-
368		~~- # Other~~
369		~~- 'wikilog-doc-import-comment' => "Documentação Wikilog importada",~~
370		~~-);~~
371		-
372	178	/** German (Deutsch)
373	179	* @author Erkan Yilmaz
374	180	*/
375	181	$messages['de'] = array(
376		~~- # Extension information~~
377		~~- 'wikilog-desc' => 'Fügt Blog-Funktionen hinzu, um einen Wiki-Blog Hybrid zu erzeugen.',~~
378		~~- 'wikilog-auto' => 'Wikilog Auto', # reserved username~~
379		~~- 'right-wl-postcomment' => 'Poste Kommentare zu Wikilog-Beiträgen',~~
380		~~- 'right-wl-moderation' => 'Moderation von Kommentaren zu wikilog-Beiträgen',~~
381		-
382		~~- # Special:Wikilog~~
	182	+ 'wikilog-desc' => 'Fügt Blog-Funktionen hinzu, um einen Wiki-Blog Hybrid zu erzeugen.',
	183	+ 'wikilog-auto' => 'Wikilog Auto', # reserved username
	184	+ 'right-wl-postcomment' => 'Poste Kommentare zu Wikilog-Beiträgen',
	185	+ 'right-wl-moderation' => 'Moderation von Kommentaren zu wikilog-Beiträgen',
383	186	'wikilog' => 'Wikilogs', # Page title
384		~~- 'wikilog-specialwikilog' => 'Wikilog', # Special page name~~
385		-
386		~~- # Logs~~
387		~~- ##TRANSLATE## 'wikilog-log-pagename' => 'Wikilog actions log',~~
388		~~- ##TRANSLATE## 'wikilog-log-pagetext' => 'Below is a list of wikilog actions.',~~
389		~~- ##TRANSLATE## 'wikilog-log-cmt-approve' => 'approved comment [[$1]]',~~
390		~~- ##TRANSLATE## 'wikilog-log-cmt-reject' => 'rejected comment [[$1]]',~~
391		~~- ##TRANSLATE## 'wikilog-log-cmt-rejdel' => 'Rejected wikilog comment from [[Special:Contributions/$1\|$1]]',~~
392		-
393		~~- # Wikilog tab~~
394		~~- 'wikilog-tab' => 'Wikilog',~~
395		~~- 'wikilog-tab-title' => 'Wikilog Aktionen',~~
396		~~- 'wikilog-information' => 'Wikilog Information',~~
397		~~- 'wikilog-post-count-published' =>~~
	187	+ 'wikilog-specialwikilog' => 'Wikilog', # Special page name
	188	+ 'wikilog-tab' => 'Wikilog',
	189	+ 'wikilog-tab-title' => 'Wikilog Aktionen',
	190	+ 'wikilog-information' => 'Wikilog Information',
	191	+ 'wikilog-post-count-published' =>
398	192	'$1 {{PLURAL:$1\|Beitrag\|Beiträge}} wurden in diesem Wikilog veröffentlicht,',
399		~~- 'wikilog-post-count-drafts' =>~~
	193	+ 'wikilog-post-count-drafts' =>
400	194	'plus $1 {{PLURAL:$1\|Beitrag\|Beiträge}}, die unveröffentlicht (Entwurf) sind,',
401		~~- 'wikilog-post-count-all' =>~~
	195	+ 'wikilog-post-count-all' =>
402	196	'insgesamt gibt es $1 {{PLURAL:$1\|Beitrag\|Beiträge}}.',
403		~~- 'wikilog-new-item' => 'Erstelle einen neuen Wikilog-Beitrag',~~
404		~~- 'wikilog-new-item-go' => 'Erstellen',~~
405		~~- 'wikilog-item-name' => 'Beitrag-Name:',~~
406		-
407		~~- # Generic strings~~
408		~~- 'wikilog-published' => 'Veröffentlicht',~~
409		~~- 'wikilog-updated' => 'Aktualisiert',~~
410		~~- 'wikilog-draft' => 'Entwurf',~~
411		~~- 'wikilog-authors' => 'Autoren',~~
412		~~- 'wikilog-wikilog' => 'Wikilog',~~
413		~~- 'wikilog-title' => 'Titel',~~
414		~~- 'wikilog-actions' => 'Aktionen',~~
415		~~- 'wikilog-comments' => 'Kommentare',~~
416		~~- ##TRANSLATE## 'wikilog-replies' => 'Replies',~~
417		-
418		~~- 'wikilog-view-archives' => 'Archive',~~
419		~~- 'wikilog-view-summary' => 'Zusammenfassung',~~
420		~~- 'wikilog-draft-title-mark' => '(Entwurf)',~~
421		~~- 'wikilog-anonymous-mark' => '(anonym)',~~
422		-
423		~~- # Pager strings~~
424		~~- 'wikilog-pager-newer-n' => '← neuere $1', # $1 = number of items~~
425		~~- 'wikilog-pager-older-n' => 'ältere $1 →', # $1 = number of items~~
426		~~- 'wikilog-pager-newest' => '←← neuester',~~
427		~~- 'wikilog-pager-oldest' => 'ältester →→',~~
428		~~- 'wikilog-pager-prev' => '← vorheriger',~~
429		~~- 'wikilog-pager-next' => 'nächster →',~~
430		~~- 'wikilog-pager-first' => '←← erster',~~
431		~~- 'wikilog-pager-last' => 'letzter →→',~~
432		~~- 'wikilog-pager-empty' =>~~
433		~~- '<div class="wl-empty">(keine Beiträge)</div>',~~
434		-
435		~~- # Comments page link text~~
436		~~- 'wikilog-no-comments' => 'keine Kommentare',~~
437		~~- 'wikilog-has-comments' => '{{PLURAL:$1\|ein Kommentar\|$1 Kommentare}}',~~
438		-
439		~~- # Wikilog item header and footer~~
440		~~- 'wikilog-item-brief-header' => ': <i><small>von $5, aus [[$1\|$2]], $6, $7.</small></i>',~~
441		~~- 'wikilog-item-brief-footer' => '',~~
442		~~- 'wikilog-item-more' => '[[$3\|→ weiterlesen...]]',~~
443		~~- 'wikilog-item-sub' => '',~~
444		~~- 'wikilog-item-header' => '',~~
445		~~- 'wikilog-item-footer' => ': <i>— $5 • $6 • $7</i>',~~
446		-
447		~~- 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|Diskussion]])',~~
448		-
449		~~- # Comments~~
450		~~- 'wikilog-comment-by-user' => 'Kommentar von <span class="wl-comment-author">$1</span> ($2)',~~
451		~~- 'wikilog-comment-by-anon' => 'Kommentar von <span class="wl-comment-author">$3</span> (anonym)',~~
452		~~- 'wikilog-comment-pending' => 'Dieser Kommentar muss noch zugelassen werden.',~~
453		~~- 'wikilog-comment-deleted' => 'Dieser Kommentar wurde gelöscht.',~~
454		~~- ##TRANSLATE## 'wikilog-comment-edited' => 'This comment was last edited on $1 ($2).', # $1 = date and time, $2 = history link~~
455		~~- 'wikilog-comment-autosumm' => 'Neuer Kommentar von $1: $2',~~
456		~~- 'wikilog-reply-to-comment' => 'Poste eine Antwort auf diesen Kommentar',~~
457		~~- ##TRANSLATE## 'wikilog-comment-page' => 'Go to this comment\'s page',~~
458		~~- ##TRANSLATE## 'wikilog-comment-edit' => 'Edit this comment',~~
459		~~- ##TRANSLATE## 'wikilog-comment-delete' => 'Delete this comment',~~
460		~~- ##TRANSLATE## 'wikilog-comment-history' => 'View comment history',~~
461		~~- ##TRANSLATE## 'wikilog-comment-approve' => 'Approve this comment (immediate action)',~~
462		~~- ##TRANSLATE## 'wikilog-comment-reject' => 'Reject this comment (immediate action)',~~
463		~~- 'wikilog-newtalk-text' => '<!-- leere Seite erzeugt durch Wikilog -->',~~
464		~~- 'wikilog-newtalk-summary' => 'automatisch erzeugt durch Wikilog',~~
465		-
466		~~- # Atom and RSS feeds~~
467		~~- 'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 = content language~~
468		~~- 'wikilog-feed-description' => 'Lese die neuesten Beiträge in diesem Feed.',~~
469		-
470		~~- # Item and comments page titles~~
471		~~- 'wikilog-title-item-full' => '$1 - $2', #1 = article title, $2 wikilog title~~
472		~~- ##TRANSLATE## 'wikilog-title-comments' => 'Comments - $1', #1 = article title~~
473		-
474		~~- # Warning and error messages~~
475		~~- 'wikilog-error-msg' => 'Wikilog: $1',~~
476		~~- 'wikilog-error-title' => 'Wikilog Fehler',~~
477		~~- 'wikilog-invalid-param' => 'Ungültiger Parameter: $1.',~~
478		~~- 'wikilog-invalid-author' => 'Ungültiger Autor: $1.',~~
479		~~- 'wikilog-invalid-date' => 'Ungültiges Datum: $1.',~~
480		~~- 'wikilog-invalid-tag' => 'Ungültiges Tag: $1.',~~
481		~~- 'wikilog-invalid-file' => 'Ungültige Datei: $1.',~~
482		~~- 'wikilog-file-not-found' => 'Nicht vorhandene Datei: $1.',~~
483		~~- 'wikilog-not-an-image' => 'Datei ist kein Bild: $1.',~~
484		~~- 'wikilog-out-of-context' =>~~
	197	+ 'wikilog-new-item' => 'Erstelle einen neuen Wikilog-Beitrag',
	198	+ 'wikilog-new-item-go' => 'Erstellen',
	199	+ 'wikilog-item-name' => 'Beitrag-Name:',
	200	+ 'wikilog-published' => 'Veröffentlicht',
	201	+ 'wikilog-updated' => 'Aktualisiert',
	202	+ 'wikilog-draft' => 'Entwurf',
	203	+ 'wikilog-authors' => 'Autoren',
	204	+ 'wikilog-wikilog' => 'Wikilog',
	205	+ 'wikilog-title' => 'Titel',
	206	+ 'wikilog-actions' => 'Aktionen',
	207	+ 'wikilog-comments' => 'Kommentare',
	208	+ 'wikilog-view-archives' => 'Archive',
	209	+ 'wikilog-view-summary' => 'Zusammenfassung',
	210	+ 'wikilog-draft-title-mark' => '(Entwurf)',
	211	+ 'wikilog-anonymous-mark' => '(anonym)',
	212	+ 'wikilog-pager-newer-n' => '← neuere $1', # $1 = number of items
	213	+ 'wikilog-pager-older-n' => 'ältere $1 →', # $1 = number of items
	214	+ 'wikilog-pager-newest' => '←← neuester',
	215	+ 'wikilog-pager-oldest' => 'ältester →→',
	216	+ 'wikilog-pager-prev' => '← vorheriger',
	217	+ 'wikilog-pager-next' => 'nächster →',
	218	+ 'wikilog-pager-first' => '←← erster',
	219	+ 'wikilog-pager-last' => 'letzter →→',
	220	+ 'wikilog-pager-empty' => '(keine Beiträge)',
	221	+ 'wikilog-no-comments' => 'keine Kommentare',
	222	+ 'wikilog-has-comments' => '{{PLURAL:$1\|ein Kommentar\|$1 Kommentare}}',
	223	+ 'wikilog-item-brief-header' => ': <i><small>von $5, aus [[$1\|$2]], $6, $7.</small></i>',
	224	+ 'wikilog-item-brief-footer' => '',
	225	+ 'wikilog-item-more' => '[[$3\|→ weiterlesen...]]',
	226	+ 'wikilog-item-sub' => '',
	227	+ 'wikilog-item-header' => '',
	228	+ 'wikilog-item-footer' => ': <i>— $5 • $6 • $7</i>',
	229	+ 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|Diskussion]])',
	230	+ 'wikilog-comment-by-user' => 'Kommentar von $1 ($2)',
	231	+ 'wikilog-comment-by-anon' => 'Kommentar von $3 (anonym)',
	232	+ 'wikilog-comment-pending' => 'Dieser Kommentar muss noch zugelassen werden.',
	233	+ 'wikilog-comment-deleted' => 'Dieser Kommentar wurde gelöscht.',
	234	+ 'wikilog-comment-autosumm' => 'Neuer Kommentar von $1: $2',
	235	+ 'wikilog-reply-to-comment' => 'Poste eine Antwort auf diesen Kommentar',
	236	+ 'wikilog-newtalk-text' => '<!-- leere Seite erzeugt durch Wikilog -->',
	237	+ 'wikilog-newtalk-summary' => 'automatisch erzeugt durch Wikilog',
	238	+ 'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 = content language
	239	+ 'wikilog-feed-description' => 'Lese die neuesten Beiträge in diesem Feed.',
	240	+ 'wikilog-title-item-full' => '$1 - $2', # 1 = article title, $2 wikilog title
	241	+ 'wikilog-error-msg' => 'Wikilog: $1',
	242	+ 'wikilog-error-title' => 'Wikilog Fehler',
	243	+ 'wikilog-invalid-param' => 'Ungültiger Parameter: $1.',
	244	+ 'wikilog-invalid-author' => 'Ungültiger Autor: $1.',
	245	+ 'wikilog-invalid-date' => 'Ungültiges Datum: $1.',
	246	+ 'wikilog-invalid-tag' => 'Ungültiges Tag: $1.',
	247	+ 'wikilog-invalid-file' => 'Ungültige Datei: $1.',
	248	+ 'wikilog-file-not-found' => 'Nicht vorhandene Datei: $1.',
	249	+ 'wikilog-not-an-image' => 'Datei ist kein Bild: $1.',
	250	+ 'wikilog-out-of-context' =>
485	251	'Warnung: Wikilog Tags werden nicht im Zusammenhang (out of context) benutzt. ' .
486	252	'Sie sollten nur in Beiträgen im Wikilog Namensraum benutzt werden.',
487		~~- 'wikilog-too-many-authors' =>~~
	253	+ 'wikilog-too-many-authors' =>
488	254	'Warnung: Zu viele Autoren werden in diesem Wikilog-Beitrag aufgeführt.',
489		~~- 'wikilog-too-many-tags' =>~~
	255	+ 'wikilog-too-many-tags' =>
490	256	'Warnung: Zu viele Tags werden in diesem Wikilog-Beitrag erfasst.',
491		~~- 'wikilog-comment-is-empty' =>~~
	257	+ 'wikilog-comment-is-empty' =>
492	258	'Der gesendete Kommentar ist leer.',
493		~~- 'wikilog-comment-too-long' =>~~
	259	+ 'wikilog-comment-too-long' =>
494	260	'Der gesendete Kommentar ist zu lang.',
495	261	'wikilog-comment-invalid-name' =>
496	262	'Der angegebene Name ist ungültig.',
497		~~- ##TRANSLATE## 'wikilog-no-such-article' =>~~
498		~~- ##TRANSLATE## 'The requested wikilog article does not exist.',~~
499		-
500		~~- 'wikilog-reading-draft' =>~~
501		~~- '<div class="mw-warning">'.~~
502		~~- '<p>Dieser Wikilog-Beitrag ist ein Entwurf, er wurde noch nicht veröffentlicht.</p>'.~~
503		~~- '</div>',~~
504		-
	263	+ 'wikilog-reading-draft' => 'Dieser Wikilog-Beitrag ist ein Entwurf, er wurde noch nicht veröffentlicht.',
505	264	'wikilog-posting-anonymously' => # $1 = "Login" link
506		~~- 'Sie sind zur Zeit nicht eingeloggt; ihr Kommentar wird anonym '.~~
507		~~- 'versendet, identifiziert durch ihre Internetverbindungsadresse. '.~~
508		~~- 'Sie sollten oben entweder ein Pseudonym angeben, um ihren '.~~
	265	+ 'Sie sind zur Zeit nicht eingeloggt; ihr Kommentar wird anonym ' .
	266	+ 'versendet, identifiziert durch ihre Internetverbindungsadresse. ' .
	267	+ 'Sie sollten oben entweder ein Pseudonym angeben, um ihren ' .
509	268	'Kommentar zu identifizieren oder $1, damit er passend zugeordnet wird.',
510		~~- ##TRANSLATE## 'wikilog-anonymous-moderated' =>~~
511		~~- ##TRANSLATE## 'After you submit your comment, it will not be immediately '.~~
512		~~- ##TRANSLATE## 'visible on this page. The comment will only appear after it '.~~
513		~~- ##TRANSLATE## 'it is reviewed by a moderator.',~~
	269	+ 'wikilog-post-comment' => 'Poste einen neuen Kommentar',
	270	+ 'wikilog-post-reply' => 'Poste eine neue Antwort',
	271	+ 'wikilog-form-legend' => 'Suche nach Wikilog-Beiträgen',
	272	+ 'wikilog-form-wikilog' => 'Wikilog:',
	273	+ 'wikilog-form-category' => 'Kategorie:',
	274	+ 'wikilog-form-name' => 'Name:',
	275	+ 'wikilog-form-author' => 'Autor:',
	276	+ 'wikilog-form-tag' => 'Tag:',
	277	+ 'wikilog-form-date' => 'Datum:',
	278	+ 'wikilog-form-status' => 'Status:',
	279	+ 'wikilog-form-preview' => 'Vorschau:',
	280	+ 'wikilog-form-comment' => 'Kommentar:',
	281	+ 'wikilog-show-all' => 'Alle Beiträge',
	282	+ 'wikilog-show-published' => 'Veröffentlicht',
	283	+ 'wikilog-show-drafts' => 'Entwürfe',
	284	+ 'wikilog-submit' => 'Abschicken',
	285	+ 'wikilog-preview' => 'Vorher betrachten', # verb
	286	+ 'wikilog-edit-lc' => 'bearbeiten', # verb
	287	+ 'wikilog-reply-lc' => 'antworten', # verb
	288	+);
514	289
515		~~- # Forms~~
516		~~- 'wikilog-post-comment' => 'Poste einen neuen Kommentar',~~
517		~~- 'wikilog-post-reply' => 'Poste eine neue Antwort',~~
518		~~- 'wikilog-form-legend' => 'Suche nach Wikilog-Beiträgen',~~
519		~~- 'wikilog-form-wikilog' => 'Wikilog:',~~
520		~~- 'wikilog-form-category' => 'Kategorie:',~~
521		~~- 'wikilog-form-name' => 'Name:',~~
522		~~- 'wikilog-form-author' => 'Autor:',~~
523		~~- 'wikilog-form-tag' => 'Tag:',~~
524		~~- 'wikilog-form-date' => 'Datum:',~~
525		~~- 'wikilog-form-status' => 'Status:',~~
526		~~- 'wikilog-form-preview' => 'Vorschau:',~~
527		~~- 'wikilog-form-comment' => 'Kommentar:',~~
528		~~- 'wikilog-show-all' => 'Alle Beiträge',~~
529		~~- 'wikilog-show-published' => 'Veröffentlicht',~~
530		~~- 'wikilog-show-drafts' => 'Entwürfe',~~
531		~~- 'wikilog-submit' => 'Abschicken',~~
532		~~- 'wikilog-preview' => 'Vorher betrachten', # verb~~
533		~~- 'wikilog-edit-lc' => 'bearbeiten', # verb~~
534		~~- 'wikilog-reply-lc' => 'antworten', # verb~~
535		~~- ##TRANSLATE## 'wikilog-delete-lc' => 'delete', # verb~~
536		~~- ##TRANSLATE## 'wikilog-approve-lc' => 'approve', # verb~~
537		~~- ##TRANSLATE## 'wikilog-reject-lc' => 'reject', # verb~~
538		~~- ##TRANSLATE## 'wikilog-page-lc' => 'page', # noun~~
539		~~- ##TRANSLATE## 'wikilog-history-lc' => 'history',~~
540		-
541		~~- # Other~~
542		~~- ##TRANSLATE## 'wikilog-doc-import-comment' => "Imported Wikilog documentation",~~
543		-
	290	+/** Portuguese (Português)
	291	+ * @author Juliano F. Ravasi
	292	+ */
	293	+$messages['pt'] = array(
	294	+ 'wikilog-desc' => 'Adiciona recursos de blog, criando um híbrido wiki-blog',
	295	+ 'wikilog-auto' => 'Wikilog Auto', # reserved username
	296	+ 'right-wl-postcomment' => 'Postar comentários em artigos wikilog',
	297	+ 'right-wl-moderation' => 'Moderação de comentários de artigos wikilog',
	298	+ 'wikilog' => 'Wikilogs',
	299	+ 'wikilog-specialwikilog' => 'Wikilog',
	300	+ 'wikilog-log-pagename' => 'Registro de ações wikilog',
	301	+ 'wikilog-log-pagetext' => 'Abaixo está uma lista das ações wikilog.',
	302	+ 'wikilog-log-cmt-approve' => 'aprovou o comentário [[$1]]',
	303	+ 'wikilog-log-cmt-reject' => 'rejeitou o comentário [[$1]]',
	304	+ 'wikilog-log-cmt-rejdel' => 'Comentário wikilog de [[Special:Contributions/$1\|$1]] rejeitado',
	305	+ 'wikilog-tab' => 'Wikilog',
	306	+ 'wikilog-tab-title' => 'Ações wikilog',
	307	+ 'wikilog-information' => 'Informações do wikilog',
	308	+ 'wikilog-post-count-published' => 'Há $1 {{PLURAL:$1\|artigo publicado\|artigos publicados}} neste wikilog,',
	309	+ 'wikilog-post-count-drafts' => 'mais $1 {{PLURAL:$1\|artigo não-publicado (rascunho)\|artigos não-publicados (rascunhos)}},',
	310	+ 'wikilog-post-count-all' => 'para um total de $1 {{PLURAL:$1\|artigo\|artigos}}.',
	311	+ 'wikilog-new-item' => 'Criar novo artigo wikilog',
	312	+ 'wikilog-new-item-go' => 'Criar',
	313	+ 'wikilog-item-name' => 'Nome do artigo:',
	314	+ 'wikilog-published' => 'Publicado',
	315	+ 'wikilog-updated' => 'Atualizado',
	316	+ 'wikilog-draft' => 'Rascunho',
	317	+ 'wikilog-authors' => 'Autores',
	318	+ 'wikilog-wikilog' => 'Wikilog',
	319	+ 'wikilog-title' => 'Título',
	320	+ 'wikilog-actions' => 'Ações',
	321	+ 'wikilog-comments' => 'Comentários',
	322	+ 'wikilog-replies' => 'Respostas',
	323	+ 'wikilog-view-archives' => 'Arquivos',
	324	+ 'wikilog-view-summary' => 'Resumo',
	325	+ 'wikilog-draft-title-mark' => '(rascunho)',
	326	+ 'wikilog-anonymous-mark' => '(anônimo)',
	327	+ 'wikilog-pager-newer-n' => '← $1 próximos', # $1 = number of items
	328	+ 'wikilog-pager-older-n' => '$1 anteriores →', # $1 = number of items
	329	+ 'wikilog-pager-newest' => '←← mais recentes',
	330	+ 'wikilog-pager-oldest' => 'mais antigos →→',
	331	+ 'wikilog-pager-prev' => '← anterior',
	332	+ 'wikilog-pager-next' => 'próxima →',
	333	+ 'wikilog-pager-first' => '←← primeira',
	334	+ 'wikilog-pager-last' => 'última →→',
	335	+ 'wikilog-pager-empty' => '(não há itens)',
	336	+ 'wikilog-no-comments' => 'não há comentários',
	337	+ 'wikilog-has-comments' => '{{PLURAL:$1\|um comentário\|$1 comentários}}',
	338	+ 'wikilog-item-brief-header' => ': <i><small>por $5, em [[$1\|$2]], $6, $7.</small></i>',
	339	+ 'wikilog-item-brief-footer' => '',
	340	+ 'wikilog-item-more' => '[[$3\|→ continuar lendo...]]',
	341	+ 'wikilog-item-sub' => '',
	342	+ 'wikilog-item-header' => '',
	343	+ 'wikilog-item-footer' => ': <i>— $5 • $6 • $7</i>',
	344	+ 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|discussão]])',
	345	+ 'wikilog-comment-by-user' => 'Comentário por $1 ($2)',
	346	+ 'wikilog-comment-by-anon' => 'Comentário por $3 (anônimo)',
	347	+ 'wikilog-comment-pending' => 'Este comentário está aguardando aprovação.',
	348	+ 'wikilog-comment-deleted' => 'Este comentário foi apagado.',
	349	+ 'wikilog-comment-edited' => 'Este comentário foi editado pela última vez em $1 ($2).', # $1 = date and time, $2 = history link
	350	+ 'wikilog-comment-autosumm' => 'Novo comentário por $1: $2',
	351	+ 'wikilog-reply-to-comment' => 'Postar uma resposta a esse comentário',
	352	+ 'wikilog-comment-page' => 'Ir para a página deste comentário',
	353	+ 'wikilog-comment-edit' => 'Editar este comentário',
	354	+ 'wikilog-comment-delete' => 'Apagar este comentário',
	355	+ 'wikilog-comment-history' => 'Ver histórico do comentário',
	356	+ 'wikilog-comment-approve' => 'Aprovar este comentário (ação imediata)',
	357	+ 'wikilog-comment-reject' => 'Rejeitar este comentário (ação imediata)',
	358	+ 'wikilog-newtalk-text' => '<!-- página em branco criada pelo Wikilog -->',
	359	+ 'wikilog-newtalk-summary' => 'criado automaticamente pelo wikilog',
	360	+ 'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 = content language
	361	+ 'wikilog-feed-description' => 'Leia as postagens mais recentes neste feed.',
	362	+ 'wikilog-title-item-full' => '$1 - $2', # 1 = article title, $2 wikilog title
	363	+ 'wikilog-title-comments' => 'Comentários - $1', # 1 = article title
	364	+ 'wikilog-error-msg' => 'Wikilog: $1',
	365	+ 'wikilog-invalid-param' => 'Parâmetro inválido: $1.',
	366	+ 'wikilog-invalid-author' => 'Autor inválido: $1.',
	367	+ 'wikilog-invalid-date' => 'Data inválida: $1.',
	368	+ 'wikilog-invalid-tag' => 'Rótulo inválido: $1.',
	369	+ 'wikilog-invalid-file' => 'Arquivo inválido: $1.',
	370	+ 'wikilog-file-not-found' => 'Arquivo não-existente: $1.',
	371	+ 'wikilog-not-an-image' => 'Arquivo não é uma imagem: $1.',
	372	+ 'wikilog-out-of-context' => 'Aviso: Rótulos wikilog estão sendo utilizados fora de contexto. ' .
	373	+ 'Eles devem ser usados apenas em artigos no espaço de nomes do Wikilog.',
	374	+ 'wikilog-too-many-authors' => 'Aviso: Autores demais listados nesta postagem wikilog.',
	375	+ 'wikilog-too-many-tags' => 'Aviso: Rótulos demais listados nesta postagem wikilog.',
	376	+ 'wikilog-comment-is-empty' => 'O comentário postado está em branco.',
	377	+ 'wikilog-comment-too-long' => 'O comentário postado é muito longo.',
	378	+ 'wikilog-comment-invalid-name' => 'O nome fornecido é inválido.',
	379	+ 'wikilog-no-such-article' => 'O artigo wikilog solicitado não existe.',
	380	+ 'wikilog-reading-draft' => 'Este artigo wikilog é um rascunho, ainda não foi publicado.',
	381	+ 'wikilog-posting-anonymously' => # $1 = "login" link
	382	+ 'Você não está autenticado neste momento; seu comentário será ' .
	383	+ 'postado anonimamente, identificado pelo endereço de sua conexão ' .
	384	+ 'Internet. Você deve fornecer um pseudônimo acima para ' .
	385	+ 'identificar seu comentário ou $1 para que ele seja creditado ' .
	386	+ 'apropriadamente.',
	387	+ 'wikilog-posting-anonymously' =>
	388	+ "Seu comentário será postado anonimamente. Você pode " .
	389	+ "$1 para que seu comentário seja identificado.",
	390	+ 'wikilog-anonymous-moderated' =>
	391	+ 'Após submeter seu comentário, este não será imediatamente ' .
	392	+ 'visível nesta página. O comentário somente aparecerá após ser ' .
	393	+ 'revisado por um moderador.',
	394	+ 'wikilog-post-comment' => 'Postar um novo comentário',
	395	+ 'wikilog-post-reply' => 'Postar uma nova resposta',
	396	+ 'wikilog-form-legend' => 'Procurar por postagens wikilog',
	397	+ 'wikilog-form-wikilog' => 'Wikilog:',
	398	+ 'wikilog-form-category' => 'Categoria:',
	399	+ 'wikilog-form-name' => 'Nome:',
	400	+ 'wikilog-form-author' => 'Autor:',
	401	+ 'wikilog-form-tag' => 'Rótulo:',
	402	+ 'wikilog-form-date' => 'Data:',
	403	+ 'wikilog-form-status' => 'Estado:',
	404	+ 'wikilog-form-preview' => 'Previsão:',
	405	+ 'wikilog-form-comment' => 'Comentário:',
	406	+ 'wikilog-show-all' => 'Todas as postagens',
	407	+ 'wikilog-show-published' => 'Publicados',
	408	+ 'wikilog-show-drafts' => 'Rascunhos',
	409	+ 'wikilog-submit' => 'Submeter',
	410	+ 'wikilog-preview' => 'Previsão', # verb
	411	+ 'wikilog-edit-lc' => 'editar', # verb
	412	+ 'wikilog-reply-lc' => 'responder', # verb
	413	+ 'wikilog-delete-lc' => 'apagar', # verb
	414	+ 'wikilog-approve-lc' => 'aprovar', # verb
	415	+ 'wikilog-reject-lc' => 'rejeitar', # verb
	416	+ 'wikilog-page-lc' => 'página', # noun
	417	+ 'wikilog-history-lc' => 'histórico', # noun
	418	+ 'wikilog-doc-import-comment' => "Documentação Wikilog importada",
544	419	);
Index: trunk/extensions/Wikilog/WikilogItem.php
—	—	@@ -28,28 +28,26 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Wikilog article database entry.
35	34	*/
36	35	class WikilogItem
37	36	{
38		-
39	37	/**
40	38	* General data about the article.
41	39	*/
42		~~- public $mID = NULL; ///< Article ID.~~
43		~~- public $mName = NULL; ///< Article title text (as in DB).~~
44		~~- public $mTitle = NULL; ///< Article Title object.~~
45		~~- public $mParent = NULL; ///< Parent wikilog article ID.~~
46		~~- public $mParentName = NULL; ///< Parent wikilog title text.~~
47		~~- public $mParentTitle = NULL; ///< Parent wikilog Title object.~~
48		~~- public $mPublish = NULL; ///< Article is published.~~
49		~~- public $mPubDate = NULL; ///< Date the article was published.~~
50		~~- public $mUpdated = NULL; ///< Date the article was last updated.~~
51		~~- public $mAuthors = array(); ///< Array of authors.~~
52		~~- public $mTags = array(); ///< Array of tags.~~
53		~~- public $mNumComments = NULL; ///< Cached number of comments.~~
	40	+ public $mID = NULL; // /< Article ID.
	41	+ public $mName = NULL; // /< Article title text (as in DB).
	42	+ public $mTitle = NULL; // /< Article Title object.
	43	+ public $mParent = NULL; // /< Parent wikilog article ID.
	44	+ public $mParentName = NULL; // /< Parent wikilog title text.
	45	+ public $mParentTitle = NULL; // /< Parent wikilog Title object.
	46	+ public $mPublish = NULL; // /< Article is published.
	47	+ public $mPubDate = NULL; // /< Date the article was published.
	48	+ public $mUpdated = NULL; // /< Date the article was last updated.
	49	+ public $mAuthors = array(); // /< Array of authors.
	50	+ public $mTags = array(); // /< Array of tags.
	51	+ public $mNumComments = NULL; // /< Cached number of comments.
54	52
55	53	/**
56	54	* Constructor.
—	—	@@ -173,7 +171,7 @@
174	172	}
175	173
176	174	$comments = array();
177		~~- foreach( $result as $row ) {~~
	175	+ foreach ( $result as $row ) {
178	176	$comment = WikilogComment::newFromRow( $this, $row );
179	177	if ( $row->page_latest ) {
180	178	$rev = Revision::newFromId( $row->page_latest );
—	—	@@ -278,8 +276,8 @@
279	277	extract( $dbr->tableNames( 'wikilog_posts', 'page' ) );
280	278	return array(
281	279	'tables' =>
282		~~- "{$wikilog_posts} ".~~
283		~~- "LEFT JOIN {$page} AS w ON (w.page_id = wlp_parent) ".~~
	280	+ "{$wikilog_posts} " .
	281	+ "LEFT JOIN {$page} AS w ON (w.page_id = wlp_parent) " .
284	282	"LEFT JOIN {$page} AS p ON (p.page_id = wlp_page) ",
285	283	'fields' => array(
286	284	'wlp_page',
—	—	@@ -298,5 +296,4 @@
299	297	)
300	298	);
301	299	}
302		-
303	300	}
Index: trunk/extensions/Wikilog/WikilogPager.php
—	—	@@ -28,7 +28,6 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Common wikilog pager interface.
35	34	*/
—	—	@@ -38,7 +37,6 @@
39	38	function getNavigationBar( $class = 'wl-navbar-any' );
40	39	}
41	40
42		-
43	41	/**
44	42	* Summary pager.
45	43	*
—	—	@@ -55,13 +53,12 @@
56	54	extends ReverseChronologicalPager
57	55	implements WikilogPager
58	56	{
59		-
60	57	# Override default limits.
61	58	public $mLimitsShown = array( 5, 10, 20, 50 );
62	59
63	60	# Local variables.
64		~~- protected $mQuery = NULL; ///< Wikilog item query data~~
65		~~- protected $mIncluding = false; ///< If pager is being included~~
	61	+ protected $mQuery = NULL; // /< Wikilog item query data
	62	+ protected $mIncluding = false; // /< If pager is being included
66	63
67	64	/**
68	65	* Constructor.
—	—	@@ -126,7 +123,7 @@
127	124	}
128	125
129	126	function getEmptyBody() {
130		~~- return wfMsgExt( 'wikilog-pager-empty', array( 'parsemag' ) );~~
	127	+ return '<div class="wl-empty">' . wfMsgExt( 'wikilog-pager-empty', array( 'parsemag' ) ) . "</div>";
131	128	}
132	129
133	130	function getNavigationBar( $class = 'wl-navbar-any' ) {
—	—	@@ -185,7 +182,7 @@
186	183
187	184	# Title heading, with link.
188	185	$heading = $skin->makeKnownLinkObj( $item->mTitle, $item->mName .
189		~~- ( $item->getIsPublished() ? '' : ' '. wfMsgForContent( 'wikilog-draft-title-mark' ) ) );~~
	186	+ ( $item->getIsPublished() ? '' : ' ' . wfMsgForContent( 'wikilog-draft-title-mark' ) ) );
190	187	$result .= "<h2>{$heading}</h2>\n";
191	188
192	189	# Item header.
—	—	@@ -261,14 +258,12 @@
262	259	*/
263	260	private function editLink( $title ) {
264	261	$skin = $this->getSkin();
265		~~- $url = $skin->makeKnownLinkObj( $title, wfMsg('wikilog-edit-lc'), 'action=edit' );~~
	262	+ $url = $skin->makeKnownLinkObj( $title, wfMsg( 'wikilog-edit-lc' ), 'action=edit' );
266	263	$result = wfMsg( 'editsection-brackets', $url );
267	264	return "<span class=\"editsection\">$result</span>";
268	265	}
269		-
270	266	}
271	267
272		-
273	268	/**
274	269	* Template pager.
275	270	*
—	—	@@ -292,7 +287,6 @@
293	288	class WikilogTemplatePager
294	289	extends WikilogSummaryPager
295	290	{
296		-
297	291	protected $mTemplate, $mTemplateTitle;
298	292
299	293	/**
—	—	@@ -369,10 +363,8 @@
370	364
371	365	return $this->parse( $text );
372	366	}
373		-
374	367	}
375	368
376		-
377	369	/**
378	370	* Archives pager.
379	371	*
—	—	@@ -384,10 +376,9 @@
385	377	extends TablePager
386	378	implements WikilogPager
387	379	{
388		-
389	380	# Local variables.
390		~~- protected $mQuery = NULL; ///< Wikilog item query data~~
391		~~- protected $mIncluding = false; ///< If pager is being included~~
	381	+ protected $mQuery = NULL; // /< Wikilog item query data
	382	+ protected $mIncluding = false; // /< If pager is being included
392	383
393	384	/**
394	385	* Constructor.
—	—	@@ -539,7 +530,7 @@
540	531	$fields = array();
541	532
542	533	$fields['wlp_pubdate'] = wfMsgHtml( 'wikilog-published' );
543		~~-// $fields['wlp_updated'] = wfMsgHtml( 'wikilog-updated' );~~
	534	+ // $fields['wlp_updated'] = wfMsgHtml( 'wikilog-updated' );
544	535	$fields['wlp_authors'] = wfMsgHtml( 'wikilog-authors' );
545	536
546	537	if ( !$this->mQuery->isSingleWikilog() )
—	—	@@ -590,9 +581,7 @@
591	582	*/
592	583	private function editLink( $title ) {
593	584	$skin = $this->getSkin();
594		~~- $url = $skin->makeKnownLinkObj( $title, wfMsg('wikilog-edit-lc'), 'action=edit' );~~
	585	+ $url = $skin->makeKnownLinkObj( $title, wfMsg( 'wikilog-edit-lc' ), 'action=edit' );
595	586	return wfMsg( 'wikilog-brackets', $url );
596	587	}
597		-
598	588	}
599		-
Index: trunk/extensions/Wikilog/WlFeed.i18n.php
—	—	@@ -7,21 +7,18 @@
8	8
9	9	$messages = array();
10	10
11		-
12	11	/** English
13	12	* @author Juliano F. Ravasi
14	13	*/
15	14	$messages['en'] = array(
16	15	# Extension description
17		~~- 'wlfeed-desc' => 'Enhanced feed generation classes.',~~
	16	+ 'wlfeed-desc' => 'Enhanced feed generation classes',
18	17	);
19	18
20		-
21	19	/** Portuguese
22	20	* @author Juliano F. Ravasi
23	21	*/
24	22	$messages['pt'] = array(
25	23	# Extension description
26		~~- 'wlfeed-desc' => 'Classes aprimoradas para geração de feeds.',~~
	24	+ 'wlfeed-desc' => 'Classes aprimoradas para geração de feeds',
27	25	);
28		-
Index: trunk/extensions/Wikilog/WikilogUtils.php
—	—	@@ -34,7 +34,6 @@
35	35	*/
36	36	class WikilogUtils
37	37	{
38		-
39	38	/**
40	39	* Retrieves an article parsed output either from parser cache or by
41	40	* parsing it again. If parsing again, stores it back into parser cache.
—	—	@@ -130,20 +129,20 @@
131	130	$fh_diff = array_diff_key( $wgParser->mFunctionHooks, $newparser->mFunctionHooks );
132	131
133	132	if ( !empty( $th_diff ) \|\| !empty( $tt_diff ) \|\| !empty( $fh_diff ) ) {
134		~~- wfDebug("*** Wikilog WARNING: Detected broken extensions installed. "~~
	133	+ wfDebug( "*** Wikilog WARNING: Detected broken extensions installed. "
135	134	. "A second instance of the parser is not properly initialized. "
136		~~- . "The following hooks are missing:\n");~~
	135	+ . "The following hooks are missing:\n" );
137	136	if ( !empty( $th_diff ) ) {
138	137	$hooks = implode( ', ', array_keys( $th_diff ) );
139		~~- wfDebug("*** Tag hooks: $hooks.\n");~~
	138	+ wfDebug( "*** Tag hooks: $hooks.\n" );
140	139	}
141	140	if ( !empty( $tt_diff ) ) {
142	141	$hooks = implode( ', ', array_keys( $tt_diff ) );
143		~~- wfDebug("*** Transparent tag hooks: $hooks.\n");~~
	142	+ wfDebug( "*** Transparent tag hooks: $hooks.\n" );
144	143	}
145	144	if ( !empty( $fh_diff ) ) {
146	145	$hooks = implode( ', ', array_keys( $fh_diff ) );
147		~~- wfDebug("*** Function hooks: $hooks.\n");~~
	146	+ wfDebug( "*** Function hooks: $hooks.\n" );
148	147	}
149	148	return false;
150	149	} else {
—	—	@@ -282,7 +281,7 @@
283	282	$rows = array();
284	283	foreach ( $fields as $field ) {
285	284	if ( is_array( $field ) ) {
286		~~- $row = Xml::tags( 'td', array( 'class' => 'mw-label' ), $field[0] ).~~
	285	+ $row = Xml::tags( 'td', array( 'class' => 'mw-label' ), $field[0] ) .
287	286	Xml::tags( 'td', array( 'class' => 'mw-input' ), $field[1] );
288	287	} else {
289	288	$row = Xml::tags( 'td', array( 'class' => 'mw-input',
—	—	@@ -294,5 +293,4 @@
295	294	implode( "\n", $rows ) );
296	295	return $form;
297	296	}
298		-
299	297	}
Index: trunk/extensions/Wikilog/WikilogComment.php
—	—	@@ -28,19 +28,17 @@
29	29	if ( !defined( 'MEDIAWIKI' ) )
30	30	die();
31	31
32		-
33	32	/**
34	33	* Wikilog article comment database entry.
35	34	*/
36	35	class WikilogComment
37	36	{
38		-
39	37	/**
40	38	* Comment statuses.
41	39	*/
42		~~- const S_OK = 'OK'; ///< Comment is published.~~
43		~~- const S_PENDING = 'PENDING'; ///< Comment is pending moderation.~~
44		~~- const S_DELETED = 'DELETED'; ///< Comment was removed.~~
	40	+ const S_OK = 'OK'; // /< Comment is published.
	41	+ const S_PENDING = 'PENDING'; // /< Comment is pending moderation.
	42	+ const S_DELETED = 'DELETED'; // /< Comment was removed.
45	43
46	44	/**
47	45	* Mapping of comment statuses to readable messages. System messages are
—	—	@@ -60,19 +58,19 @@
61	59	/**
62	60	* General data about the comment.
63	61	*/
64		~~- public $mID = NULL; ///< Comment ID.~~
65		~~- public $mParent = NULL; ///< Parent comment ID.~~
66		~~- public $mThread = NULL; ///< Comment thread.~~
67		~~- public $mUserID = NULL; ///< Comment author user id.~~
68		~~- public $mUserText = NULL; ///< Comment author user name.~~
69		~~- public $mAnonName = NULL; ///< Comment anonymous author name.~~
70		~~- public $mStatus = NULL; ///< Comment status.~~
71		~~- public $mTimestamp = NULL; ///< Date the comment was published.~~
72		~~- public $mUpdated = NULL; ///< Date the comment was last updated.~~
73		~~- public $mCommentPage = NULL; ///< Comment page id.~~
74		~~- public $mCommentTitle = NULL; ///< Comment page title.~~
75		~~- public $mCommentRev = NULL; ///< Comment revision id.~~
76		~~- public $mText = NULL; ///< Comment text.~~
	62	+ public $mID = NULL; // /< Comment ID.
	63	+ public $mParent = NULL; // /< Parent comment ID.
	64	+ public $mThread = NULL; // /< Comment thread.
	65	+ public $mUserID = NULL; // /< Comment author user id.
	66	+ public $mUserText = NULL; // /< Comment author user name.
	67	+ public $mAnonName = NULL; // /< Comment anonymous author name.
	68	+ public $mStatus = NULL; // /< Comment status.
	69	+ public $mTimestamp = NULL; // /< Date the comment was published.
	70	+ public $mUpdated = NULL; // /< Date the comment was last updated.
	71	+ public $mCommentPage = NULL; // /< Comment page id.
	72	+ public $mCommentTitle = NULL; // /< Comment page title.
	73	+ public $mCommentRev = NULL; // /< Comment revision id.
	74	+ public $mText = NULL; // /< Comment text.
77	75
78	76	/**
79	77	* Whether the text was changed, and thus a database update is required.
—	—	@@ -258,7 +256,7 @@
259	257	public function getAutoSummary() {
260	258	global $wgContLang;
261	259	$user = $this->mUserID ? $this->mUserText : $this->mAnonName;
262		~~- $summ = $wgContLang->truncate( str_replace("\n", ' ', $this->mText),~~
	260	+ $summ = $wgContLang->truncate( str_replace( "\n", ' ', $this->mText ),
263	261	max( 0, 200 - strlen( wfMsgForContent( 'wikilog-comment-autosumm' ) ) ),
264	262	'...' );
265	263	return wfMsgForContent( 'wikilog-comment-autosumm', $user, $summ );
—	—	@@ -483,7 +481,7 @@
484	482	extract( $dbr->tableNames( 'wikilog_comments', 'page' ) );
485	483	return array(
486	484	'tables' =>
487		~~- "{$wikilog_comments} ".~~
	485	+ "{$wikilog_comments} " .
488	486	"LEFT JOIN {$page} ON (page_id = wlc_comment_page)",
489	487	'fields' => array(
490	488	'wlc_id',
—	—	@@ -503,5 +501,4 @@
504	502	)
505	503	);
506	504	}
507		-
508	505	}

Follow-up revisions

Revision	Commit summary	Author	Date
r58345	Fix doxygen breakage per CR on r58311	siebrand	22:28, 29 October 2009
r58580	* remove comma from 'wikilog-post-count-published' which I accidentally left ...	siebrand	13:14, 5 November 2009

Comments

#Comment by Juliano (talk | contribs) 22:19, 29 October 2009

Siebrand, thanks for the reformatting!

There is only one issue. Many documentation comments, originally "///< ", were changed to "// /< ". This breaks Doxygen parsing:

http://www.stack.nl/~dimitri/doxygen/docblocks.html#memberdoc

#Comment by Siebrand (talk | contribs) 22:26, 29 October 2009

I missed that. I've used stylize.php (trunk/tools/coding-tools/). Tim Starling has written it. If you can patch it, please do, as I have observed it doing the same for "###" -> "# ##", which I have corrected in at least one instance. I didn't know that "///" had a meaning in doxygen. I'll see if I can fix that.

Status & tagging log

18:06, 30 October 2009 😂 (talk | contribs) changed the status of r58311 [removed: new added: deferred]