r104804 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r104803‎ \| r104804 \| r104805 >
Date:	00:20, 1 December 2011
Author:	juliano
Status:	deferred
Tags:
Comment:	Sync with trunk. Includes many fixes to make Wikilog work properly with MediaWiki 1.18.
Modified paths:	/branches/REL1_18/extensions/Wikilog (modified) (history) /branches/REL1_18/extensions/Wikilog/README (modified) (history) /branches/REL1_18/extensions/Wikilog/RELEASE-NOTES (modified) (history) /branches/REL1_18/extensions/Wikilog/SpecialWikilog.php (modified) (history) /branches/REL1_18/extensions/Wikilog/TODO (modified) (history) /branches/REL1_18/extensions/Wikilog/Wikilog.i18n.alias.php (modified) (history) /branches/REL1_18/extensions/Wikilog/Wikilog.i18n.magic.php (modified) (history) /branches/REL1_18/extensions/Wikilog/Wikilog.i18n.php (modified) (history) /branches/REL1_18/extensions/Wikilog/Wikilog.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogComment.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogCommentsPage.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogDefaultSettings.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogFeed.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogHooks.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogItemPage.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogItemPager.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogMainPage.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogParser.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WikilogUtils.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WlFeed.i18n.php (modified) (history) /branches/REL1_18/extensions/Wikilog/WlFeed.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/extensions/Wikilog/WikilogFeed.php
—	—	@@ -242,13 +242,7 @@
243	243	"too young: age ($age) < timeout ($wgFeedCacheTimeout) " .
244	244	"($feedkey; $tsCache; $tsData)\n" );
245	245
246		~~- # NOTE (Mw1.16- COMPAT): OutputPage::setLastModified()~~
247		~~- # introduced in Mw1.17. Remove this guard after Wl1.2.~~
248		~~- if ( method_exists( $wgOut, 'setLastModified' ) ) {~~
249		~~- $wgOut->setLastModified( $tsCache );~~
250		~~- } else {~~
251		~~- $wgOut->mLastModified = wfTimestamp( TS_RFC2822, $tsCache );~~
252		~~- }~~
	246	+ $wgOut->setLastModified( $tsCache );
253	247
254	248	return $messageMemc->get( $feedkey );
255	249	} elseif ( $tsCache >= $tsData ) {
Index: branches/REL1_18/extensions/Wikilog/WikilogItemPager.php
—	—	@@ -158,7 +158,7 @@
159	159
160	160	# Article title heading, with direct link article page and optional
161	161	# edit link (if user can edit the article).
162		~~- $titleText = $item->mName;~~
	162	+ $titleText = Sanitizer::escapeHtmlAllowEntities( $item->mName );
163	163	if ( !$item->getIsPublished() )
164	164	$titleText .= wfMsgForContent( 'wikilog-draft-title-mark' );
165	165	$heading = $skin->link( $item->mTitle, $titleText, array(), array(),
—	—	@@ -472,13 +472,13 @@
473	473
474	474	case 'wlw_title':
475	475	$page = $this->mCurrentItem->mParentTitle;
476		~~- $text = $this->mCurrentItem->mParentName;~~
	476	+ $text = Sanitizer::escapeHtmlAllowEntities( $this->mCurrentItem->mParentName );
477	477	return $this->getSkin()->link( $page, $text, array(), array(),
478	478	array( 'known', 'noclasses' ) );
479	479
480	480	case 'wlp_title':
481	481	$page = $this->mCurrentItem->mTitle;
482		~~- $text = $this->mCurrentItem->mName;~~
	482	+ $text = Sanitizer::escapeHtmlAllowEntities( $this->mCurrentItem->mName );
483	483	$s = $this->getSkin()->link( $page, $text, array(), array(),
484	484	array( 'known', 'noclasses' ) );
485	485	if ( !$this->mCurrentRow->wlp_publish ) {
Index: branches/REL1_18/extensions/Wikilog/SpecialWikilog.php
—	—	@@ -168,7 +168,7 @@
169	169	$article = new Article( $title );
170	170	$content = $article->getContent();
171	171	$wgOut->setPageTitle( $title->getPrefixedText() );
172		~~- $wgOut->addWikiTextWithTitle( $content, $title );~~
	172	+ $wgOut->addWikiTextTitle( $content, $title );
173	173	}
174	174
175	175	# Display query options.
Index: branches/REL1_18/extensions/Wikilog/WikilogMainPage.php
—	—	@@ -159,7 +159,7 @@
160	160	/**
161	161	* Returns wikilog description as formatted HTML.
162	162	*/
163		~~- protected function formatWikilogDescription( Linker $skin ) {~~
	163	+ protected function formatWikilogDescription( $skin ) {
164	164	$this->loadWikilogData();
165	165
166	166	$s = '';
—	—	@@ -188,7 +188,7 @@
189	189	/**
190	190	* Returns wikilog information as formatted HTML.
191	191	*/
192		~~- protected function formatWikilogInformation( Linker $skin ) {~~
	192	+ protected function formatWikilogInformation( $skin ) {
193	193	$dbr = wfGetDB( DB_SLAVE );
194	194
195	195	$row = $dbr->selectRow(
Index: branches/REL1_18/extensions/Wikilog/Wikilog.i18n.alias.php
—	—	@@ -43,6 +43,11 @@
44	44	'Wikilog' => array( 'ウィキ記録' ),
45	45	);
46	46
	47	+/** Luxembourgish (Lëtzebuergesch) */
	48	+$specialPageAliases['lb'] = array(
	49	+ 'Wikilog' => array( 'Wiki-Logbicher' ),
	50	+);
	51	+
47	52	/** Macedonian (Македонски) */
48	53	$specialPageAliases['mk'] = array(
49	54	'Wikilog' => array( 'Викидневник' ),
Index: branches/REL1_18/extensions/Wikilog/WikilogItemPage.php
—	—	@@ -48,15 +48,32 @@
49	49	* @param $title Article title object.
50	50	* @param $wi Wikilog info object.
51	51	*/
52		~~- function __construct( &$title, &$wi ) {~~
	52	+ public function __construct( Title $title, WikilogItem $item = null ) {
53	53	parent::__construct( $title );
54		~~- $this->mItem = WikilogItem::newFromInfo( $wi );~~
	54	+ $this->mItem = $item;
55	55	}
56	56
57	57	/**
	58	+ * Return the appropriate WikiPage object for WikilogItemPage.
	59	+ */
	60	+ protected function newPage( Title $title ) {
	61	+ return new WikilogWikiItemPage( $title );
	62	+ }
	63	+
	64	+ /**
	65	+ * Constructor from a page ID.
	66	+ * @param $id Int article ID to load.
	67	+ */
	68	+ public static function newFromID( $id ) {
	69	+ $t = Title::newFromID( $id );
	70	+ $i = WikilogItem::newFromID( $id );
	71	+ return $t == null ? null : new self( $t, $i );
	72	+ }
	73	+
	74	+ /**
58	75	* View page action handler.
59	76	*/
60		~~- function view() {~~
	77	+ public function view() {
61	78	global $wgOut, $wgUser, $wgContLang, $wgFeed, $wgWikilogFeedClasses;
62	79
63	80	# Get skin
—	—	@@ -97,7 +114,7 @@
98	115	$this->mItem->mName,
99	116	$this->mItem->mParentTitle->getPrefixedText()
100	117	);
101		~~- $wgOut->setPageTitle( $this->mItem->mName );~~
	118	+ $wgOut->setPageTitle( Sanitizer::escapeHtmlAllowEntities( $this->mItem->mName ) );
102	119	$wgOut->setHTMLTitle( wfMsg( 'pagetitle', $fullPageTitle ) );
103	120
104	121	# Item page footer.
—	—	@@ -132,35 +149,62 @@
133	150	}
134	151
135	152	/**
	153	+ * Compatibility with MediaWiki 1.17.
	154	+ * @todo Remove this in Wl1.3.
	155	+ */
	156	+ public function preSaveTransform( $text ) {
	157	+ return $this->newPage( $this->getTitle() )->preSaveTransform( $text );
	158	+ }
	159	+}
	160	+
	161	+/**
	162	+ * Wikilog WikiPage class for WikilogItemPage.
	163	+ */
	164	+class WikilogWikiItemPage
	165	+ extends WikiPage
	166	+{
	167	+ /**
	168	+ * Constructor from a page ID.
	169	+ * @param $id Int article ID to load.
	170	+ */
	171	+ public static function newFromID( $id ) {
	172	+ $t = Title::newFromID( $id );
	173	+ return $t == null ? null : new self( $t );
	174	+ }
	175	+
	176	+ /**
136	177	* Override for preSaveTransform. Enables quick post publish by signing
137	178	* the article using the standard --~~~~ marker. This causes the signature
138	179	* marker to be replaced by a {{wl-publish:...}} parser function call,
139	180	* that is then saved to the database and causes the post to be published.
140	181	*/
141		~~- function preSaveTransform( $text ) {~~
	182	+ public function preSaveTransform( $text, User $user = null, ParserOptions $popts = null ) {
142	183	global $wgParser, $wgUser;
	184	+ $user = is_null( $user ) ? $wgUser : $user;
143	185
144		~~- $popt = ParserOptions::newFromUser( $wgUser );~~
	186	+ if ( $popts === null ) {
	187	+ $popts = ParserOptions::newFromUser( $user );
	188	+ }
145	189
146	190	$t = WikilogUtils::getPublishParameters();
147		~~- $date = $t['date'];~~
148		~~- $user = $t['user'];~~
	191	+ $date_txt = $t['date'];
	192	+ $user_txt = $t['user'];
149	193
150	194	$sigs = array(
151		~~- '/\n?(--)?~~~~~\n?/m' => "\n{{wl-publish: {$date} }}\n",~~
152		~~- '/\n?(--)?~~~~\n?/m' => "\n{{wl-publish: {$date} \| {$user} }}\n",~~
153		~~- '/\n?(--)?~~~\n?/m' => "\n{{wl-author: {$user} }}\n"~~
	195	+ '/\n?(--)?~~~~~\n?/m' => "\n{{wl-publish: {$date_txt} }}\n",
	196	+ '/\n?(--)?~~~~\n?/m' => "\n{{wl-publish: {$date_txt} \| {$user_txt} }}\n",
	197	+ '/\n?(--)?~~~\n?/m' => "\n{{wl-author: {$user_txt} }}\n"
154	198	);
155	199
156	200	if ( !StubObject::isRealObject( $wgParser ) ) {
157	201	$wgParser->_unstub();
158	202	}
159		~~- $wgParser->startExternalParse( $this->mTitle, $popt, Parser::OT_WIKI );~~
	203	+ $wgParser->startExternalParse( $this->mTitle, $popts, Parser::OT_WIKI );
160	204
161	205	$text = $wgParser->replaceVariables( $text );
162	206	$text = preg_replace( array_keys( $sigs ), array_values( $sigs ), $text );
163	207	$text = $wgParser->mStripState->unstripBoth( $text );
164	208
165		~~- return parent::preSaveTransform( $text );~~
	209	+ return parent::preSaveTransform( $text, $user, $popts );
166	210	}
167	211	}
Index: branches/REL1_18/extensions/Wikilog/WlFeed.i18n.php
—	—	@@ -51,6 +51,13 @@
52	52	'wlfeed-desc' => 'رتب توليد تلقيم ممددة',
53	53	);
54	54
	55	+/** Asturian (Asturianu)
	56	+ * @author Xuacu
	57	+ */
	58	+$messages['ast'] = array(
	59	+ 'wlfeed-desc' => 'Clases de xeneración de canales ameyoraes',
	60	+);
	61	+
55	62	/** Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
56	63	* @author EugeneZelenko
57	64	*/
—	—	@@ -72,6 +79,13 @@
73	80	'wlfeed-desc' => 'Napredno generisanje klasa fida',
74	81	);
75	82
	83	+/** Catalan (Català)
	84	+ * @author Gemmaa
	85	+ */
	86	+$messages['ca'] = array(
	87	+ 'wlfeed-desc' => 'Realçava tindre una generació classes',
	88	+);
	89	+
76	90	/** Czech (Česky)
77	91	* @author Matěj Grabovský
78	92	*/
—	—	@@ -220,6 +234,13 @@
221	235	'wlfeed-desc' => 'Подобрени класи на создавање на емитувања на новости',
222	236	);
223	237
	238	+/** Malay (Bahasa Melayu)
	239	+ * @author Anakmalaysia
	240	+ */
	241	+$messages['ms'] = array(
	242	+ 'wlfeed-desc' => 'Kelas penjanaan suapan yang dipertingkat',
	243	+);
	244	+
224	245	/** Dutch (Nederlands)
225	246	* @author Siebrand
226	247	*/
—	—	@@ -299,14 +320,14 @@
300	321	'wlfeed-desc' => 'Izboljšani razredi ustvarjanja virov',
301	322	);
302	323
303		~~-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)~~
	324	+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
304	325	* @author Михајло Анђелковић
305	326	*/
306	327	$messages['sr-ec'] = array(
307	328	'wlfeed-desc' => 'Класе за побољшане фидове',
308	329	);
309	330
310		~~-/** Serbian Latin ekavian (‪Srpski (latinica)‬) */~~
	331	+/** Serbian (Latin script) (‪Srpski (latinica)‬) */
311	332	$messages['sr-el'] = array(
312	333	'wlfeed-desc' => 'Klase za poboljšane fidove',
313	334	);
Index: branches/REL1_18/extensions/Wikilog/WikilogDefaultSettings.php
—	—	@@ -29,7 +29,7 @@
30	30	if ( !defined( 'MEDIAWIKI' ) )
31	31	die();
32	32
33		-/*
	33	+/**
34	34	* --- DO NOT MAKE CHANGES TO THESE VALUES ---
35	35	*
36	36	* In order to configure the extension, copy the variables you want to change
Index: branches/REL1_18/extensions/Wikilog/Wikilog.i18n.magic.php
—	—	@@ -128,7 +128,7 @@
129	129	'wlk-subtitle' => array( 0, 'ქვესათაური' ),
130	130	);
131	131
132		~~-/** ‪Kurdî (latînî)‬ (‪Kurdî (latînî)‬) */~~
	132	+/** Kurdish (Latin script) (‪Kurdî (latînî)‬) */
133	133	$magicWords['ku-latn'] = array(
134	134	'wlk-subtitle' => array( 0, 'binnav' ),
135	135	'wlk-summary' => array( 'kurte' ),
—	—	@@ -168,6 +168,14 @@
169	169	'wlk-hidden' => array( 0, 'кекшезь' ),
170	170	);
171	171
	172	+/** Nedersaksisch (Nedersaksisch) */
	173	+$magicWords['nds-nl'] = array(
	174	+ 'wl-publish' => array( 0, 'wl-publiseren' ),
	175	+ 'wl-tags' => array( 0, 'wl-etiketten' ),
	176	+ 'wlk-icon' => array( 0, 'wlk-ikoon' ),
	177	+ 'wlk-hidden' => array( 0, 'verbörgen' ),
	178	+);
	179	+
172	180	/** Dutch (Nederlands) */
173	181	$magicWords['nl'] = array(
174	182	'wl-settings' => array( 0, 'wl-instellingen' ),
—	—	@@ -182,10 +190,10 @@
183	191
184	192	/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
185	193	$magicWords['no'] = array(
186		~~- 'wlk-subtitle' => array( 0, 'undertekst', 'subtitle' ),~~
187		~~- 'wlk-summary' => array( '1', 'sammendrag', 'summary' ),~~
188		~~- 'wlk-hidden' => array( 0, 'gjemt', 'hidden' ),~~
189		~~- 'wlk-more' => array( 0, 'mer', 'more' ),~~
	194	+ 'wlk-subtitle' => array( 0, 'undertekst' ),
	195	+ 'wlk-summary' => array( 'sammendrag' ),
	196	+ 'wlk-hidden' => array( 0, 'gjemt' ),
	197	+ 'wlk-more' => array( 0, 'mer' ),
190	198	);
191	199
192	200	/** Oriya (ଓଡ଼ିଆ) */
—	—	@@ -198,6 +206,15 @@
199	207	'wlk-more' => array( 0, 'ବେଶୀ' ),
200	208	);
201	209
	210	+/** Polish (Polski) */
	211	+$magicWords['pl'] = array(
	212	+ 'wlk-icon' => array( 0, 'ikonaWL' ),
	213	+ 'wlk-subtitle' => array( 0, 'podtytuł' ),
	214	+ 'wlk-summary' => array( 'podsumowanie' ),
	215	+ 'wlk-hidden' => array( 0, 'ukryty' ),
	216	+ 'wlk-more' => array( 0, 'więcej' ),
	217	+);
	218	+
202	219	/** Pashto (پښتو) */
203	220	$magicWords['ps'] = array(
204	221	'wlk-logo' => array( 0, 'نښه', 'logo' ),
—	—	@@ -246,7 +263,7 @@
247	264	'wlk-more' => array( 0, 'ещё' ),
248	265	);
249	266
250		~~-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬) */~~
	267	+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬) */
251	268	$magicWords['sr-ec'] = array(
252	269	'wl-settings' => array( 0, 'вл-поставке' ),
253	270	'wl-publish' => array( 0, 'вл-објава' ),
—	—	@@ -274,7 +291,7 @@
275	292	'wlk-more' => array( 0, 'மேலும்' ),
276	293	);
277	294
278		~~-/** Татарча (Татарча) */~~
	295	+/** Tatar (Cyrillic script) (Татарча) */
279	296	$magicWords['tt-cyrl'] = array(
280	297	'wlk-more' => array( 0, 'күбрәк' ),
281	298	);
—	—	@@ -294,10 +311,10 @@
295	312	'wl-author' => array( 0, '作者' ),
296	313	'wl-tags' => array( 0, '标签' ),
297	314	'wl-info' => array( 0, '信息' ),
298		~~- 'wlk-icon' => array( 0, '图标' ),~~
299		~~- 'wlk-logo' => array( 0, '徽标' ),~~
300		~~- 'wlk-subtitle' => array( 0, '小标题' ),~~
301		~~- 'wlk-summary' => array( '总结' ),~~
	315	+ 'wlk-icon' => array( 0, '记录图标' ),
	316	+ 'wlk-logo' => array( 0, '标志' ),
	317	+ 'wlk-subtitle' => array( 0, '子标题' ),
	318	+ 'wlk-summary' => array( '概要' ),
302	319	'wlk-hidden' => array( 0, '隐藏' ),
303	320	'wlk-more' => array( 0, '更多' ),
304	321	);
\ No newline at end of file
Index: branches/REL1_18/extensions/Wikilog/Wikilog.php
—	—	@@ -29,7 +29,7 @@
30	30	if ( !defined( 'MEDIAWIKI' ) )
31	31	die();
32	32
33		-/*
	33	+/**
34	34	* General extension information.
35	35	*/
36	36	$wgExtensionCredits['specialpage'][] = array(
—	—	@@ -41,7 +41,7 @@
42	42	'url' => 'http://www.mediawiki.org/wiki/Extension:Wikilog',
43	43	);
44	44
45		-/*
	45	+/**
46	46	* Constant definitions.
47	47	*/
48	48	// For source-code readability. This ought to be defined by MediaWiki (and
—	—	@@ -50,12 +50,12 @@
51	51	// one globally. It also allows us to keep compatibility.
52	52	define( 'WL_NBSP', ' ' );
53	53
54		-/*
	54	+/**
55	55	* Dependencies.
56	56	*/
57	57	require_once( dirname( __FILE__ ) . '/WlFeed.php' );
58	58
59		-/*
	59	+/**
60	60	* Messages.
61	61	*/
62	62	$dir = dirname( __FILE__ ) . '/';
—	—	@@ -63,7 +63,7 @@
64	64	$wgExtensionMessagesFiles['WikilogMagic'] = $dir . 'Wikilog.i18n.magic.php';
65	65	$wgExtensionMessagesFiles['WikilogAlias'] = $dir . 'Wikilog.i18n.alias.php';
66	66
67		-/*
	67	+/**
68	68	* Autoloaded classes.
69	69	*/
70	70	$wgAutoloadClasses += array(
—	—	@@ -82,7 +82,6 @@
83	83	// WikilogParser.php
84	84	'WikilogParser' => $dir . 'WikilogParser.php',
85	85	'WikilogParserOutput' => $dir . 'WikilogParser.php',
86		~~- 'WikilogParserCache' => $dir . 'WikilogParser.php',~~
87	86
88	87	// WikilogItemPager.php
89	88	'WikilogItemPager' => $dir . 'WikilogItemPager.php',
—	—	@@ -108,6 +107,7 @@
109	108	// Namespace pages
110	109	'WikilogMainPage' => $dir . 'WikilogMainPage.php',
111	110	'WikilogItemPage' => $dir . 'WikilogItemPage.php',
	111	+ 'WikilogWikiItemPage' => $dir . 'WikilogItemPage.php',
112	112	'WikilogCommentsPage' => $dir . 'WikilogCommentsPage.php',
113	113
114	114	// Captcha adapter
—	—	@@ -115,13 +115,13 @@
116	116	'WlCaptchaAdapter' => $dir . 'WlCaptchaAdapter.php',
117	117	);
118	118
119		-/*
	119	+/**
120	120	* Special pages.
121	121	*/
122	122	$wgSpecialPages['Wikilog'] = 'SpecialWikilog';
123	123	$wgSpecialPageGroups['Wikilog'] = 'changes';
124	124
125		-/*
	125	+/**
126	126	* Hooks.
127	127	*/
128	128	$wgExtensionFunctions[] = array( 'Wikilog', 'ExtensionInit' );
—	—	@@ -158,7 +158,7 @@
159	159	$wgHooks['GetLocalURL'][] = 'WikilogParser::GetLocalURL';
160	160	$wgHooks['GetFullURL'][] = 'WikilogParser::GetFullURL';
161	161
162		-/*
	162	+/**
163	163	* Added rights.
164	164	*/
165	165	$wgAvailableRights[] = 'wl-postcomment';
—	—	@@ -166,12 +166,12 @@
167	167	$wgGroupPermissions['user']['wl-postcomment'] = true;
168	168	$wgGroupPermissions['sysop']['wl-moderation'] = true;
169	169
170		-/*
	170	+/**
171	171	* Reserved usernames.
172	172	*/
173	173	$wgReservedUsernames[] = 'msg:wikilog-auto';
174	174
175		-/*
	175	+/**
176	176	* Logs.
177	177	*/
178	178	$wgLogTypes[] = 'wikilog';
—	—	@@ -180,7 +180,7 @@
181	181	$wgLogActions['wikilog/c-approv'] = 'wikilog-log-cmt-approve';
182	182	$wgLogActions['wikilog/c-reject'] = 'wikilog-log-cmt-reject';
183	183
184		-/*
	184	+/**
185	185	* Default settings.
186	186	*/
187	187	require_once( dirname( __FILE__ ) . '/WikilogDefaultSettings.php' );
—	—	@@ -275,7 +275,8 @@
276	276	return true;
277	277	}
278	278	} elseif ( $wi->isItem() ) {
279		~~- $article = new WikilogItemPage( $title, $wi );~~
	279	+ $item = WikilogItem::newFromInfo( $wi );
	280	+ $article = new WikilogItemPage( $title, $item );
280	281	} else {
281	282	$article = new WikilogMainPage( $title, $wi );
282	283	}
—	—	@@ -406,7 +407,7 @@
407	408	* namespace, and returns an appropriate WikilogInfo instance if so.
408	409	*
409	410	* @param $title Article title object.
410		~~- * @returns WikilogInfo instance, or NULL.~~
	411	+ * @return WikilogInfo instance, or NULL.
411	412	*/
412	413	static function getWikilogInfo( $title ) {
413	414	global $wgWikilogNamespaces;
Index: branches/REL1_18/extensions/Wikilog/WlFeed.php
—	—	@@ -29,7 +29,7 @@
30	30	if ( !defined( 'MEDIAWIKI' ) )
31	31	die();
32	32
33		-/*
	33	+/**
34	34	* General extension information.
35	35	*/
36	36	$wgExtensionCredits['other'][] = array(
—	—	@@ -41,7 +41,7 @@
42	42	'url' => 'http://www.mediawiki.org/wiki/Extension:Wikilog',
43	43	);
44	44
45		-/*
	45	+/**
46	46	* Module autoload information.
47	47	*/
48	48
—	—	@@ -61,7 +61,7 @@
62	62	'WlRSSFeedCompat' => $dir . 'WlFeed.body.php'
63	63	);
64	64
65		-/*
	65	+/**
66	66	* Extension setup.
67	67	*/
68	68
Index: branches/REL1_18/extensions/Wikilog/README
—	—	@@ -33,7 +33,7 @@
34	34
35	35	== Requirements ==
36	36
37		~~-* MediaWiki 1.16 or higher.~~
	37	+* MediaWiki 1.17 or higher.
38	38	* A MySQL database backend.
39	39
40	40	== Installation ==
Index: branches/REL1_18/extensions/Wikilog/WikilogCommentsPage.php
—	—	@@ -29,12 +29,6 @@
30	30	if ( !defined( 'MEDIAWIKI' ) )
31	31	die();
32	32
33		~~-# NOTE (Mw1.16- COMPAT): GAID_FOR_UPDATE removed and replaced by~~
34		~~-# Title::GAID_FOR_UPDATE in Mw1.17. Remove this define and replace its~~
35		~~-# occurrence WikilogCommentsPage::setCommentApproval() in Wl1.3.~~
36		~~-if ( !defined( 'GAID_FOR_UPDATE' ) )~~
37		~~- define( 'GAID_FOR_UPDATE', Title::GAID_FOR_UPDATE );~~
38		-
39	33	/**
40	34	* Wikilog comments namespace handler class.
41	35	*
—	—	@@ -166,7 +160,8 @@
167	161	}
168	162
169	163	# Add a backlink to the original article.
170		~~- $link = $this->mSkin->link( $this->mItem->mTitle, $this->mItem->mName );~~
	164	+ $link = $this->mSkin->link( $this->mItem->mTitle,
	165	+ Sanitizer::escapeHtmlAllowEntities( $this->mItem->mName ) );
171	166	$wgOut->setSubtitle( wfMsg( 'wikilog-backlink', $link ) );
172	167
173	168	# Retrieve comments (or replies) from database and display them.
—	—	@@ -407,7 +402,7 @@
408	403	array( 'content', 'parsemag' ),
409	404	$comment->mUserText
410	405	);
411		~~- $id = $title->getArticleID( GAID_FOR_UPDATE );~~
	406	+ $id = $title->getArticleID( Title::GAID_FOR_UPDATE );
412	407	if ( $this->doDeleteArticle( $reason, false, $id ) ) {
413	408	$comment->deleteComment();
414	409	$log->addEntry( 'c-reject', $title, '' );
—	—	@@ -496,7 +491,7 @@
497	492	/**
498	493	* Checks if the given comment is valid for posting.
499	494	* @param $comment Comment to validate.
500		~~- * @returns False if comment is valid, error message identifier otherwise.~~
	495	+ * @return False if comment is valid, error message identifier otherwise.
501	496	*/
502	497	protected static function validateComment( WikilogComment &$comment ) {
503	498	global $wgWikilogMaxCommentSize;
Index: branches/REL1_18/extensions/Wikilog/WikilogHooks.php
—	—	@@ -75,6 +75,17 @@
76	76	$item->mParentTitle = $wi->getTitle();
77	77	$item->mParent = $item->mParentTitle->getArticleId();
78	78
	79	+ # Override item name if {{DISPLAYTITLE:...}} was used.
	80	+ $dtText = $editInfo->output->getDisplayTitle();
	81	+ if ( $dtText ) {
	82	+ # Tags are stripped on purpose.
	83	+ $dtText = Sanitizer::stripAllTags( $dtText );
	84	+ $dtParts = explode( '/', $dtText, 2 );
	85	+ if ( count( $dtParts ) > 1 ) {
	86	+ $item->mName = $dtParts[1];
	87	+ }
	88	+ }
	89	+
79	90	$item->resetID( $article->getId() );
80	91
81	92	# Check if we have any wikilog metadata available.
—	—	@@ -218,6 +229,7 @@
219	230	$item = WikilogItem::newFromID( $pageid );
220	231	if ( $wi && $wi->isItem() && !$wi->isTalk() && $item ) {
221	232	$item->mName = $wi->getItemName();
	233	+ # FIXME: need to reparse due to {{DISPLAYTITLE:...}}.
222	234	$item->mTitle = $wi->getItemTitle();
223	235	$item->mParentName = $wi->getName();
224	236	$item->mParentTitle = $wi->getTitle();
—	—	@@ -322,32 +334,19 @@
323	335	*
324	336	* @todo Add support for PostgreSQL and SQLite databases.
325	337	*/
326		~~- static function ExtensionSchemaUpdates( $updater = null ) {~~
	338	+ static function ExtensionSchemaUpdates( $updater ) {
327	339	$dir = dirname( __FILE__ ) . '/';
328	340
329		~~- if ( $updater === null ) {~~
330		~~- global $wgDBtype, $wgExtNewIndexes, $wgExtNewTables;~~
331		~~- if ( $wgDBtype == 'mysql' ) {~~
332		~~- $wgExtNewTables[] = array( "wikilog_wikilogs", "{$dir}wikilog-tables.sql" );~~
333		~~- $wgExtNewIndexes[] = array( "wikilog_comments", "wlc_timestamp", "{$dir}archives/patch-comments-indexes.sql" );~~
334		~~- } else {~~
335		~~- // TODO: PostgreSQL, SQLite, etc...~~
336		~~- print "\n" .~~
337		~~- "Warning: There are no table structures for the Wikilog\n" .~~
338		~~- "extension other than for MySQL at this moment.\n\n";~~
339		~~- }~~
	341	+ if ( $updater->getDB()->getType() == 'mysql' ) {
	342	+ $updater->addExtensionUpdate( array( 'addTable', "wikilog_wikilogs",
	343	+ "{$dir}wikilog-tables.sql", true ) );
	344	+ $updater->addExtensionUpdate( array( 'addIndex', "wikilog_comments",
	345	+ "wlc_timestamp", "{$dir}archives/patch-comments-indexes.sql", true ) );
340	346	} else {
341		~~- if ( $updater->getDB()->getType() == 'mysql' ) {~~
342		~~- $updater->addExtensionUpdate( array( 'addTable', "wikilog_wikilogs",~~
343		~~- "{$dir}wikilog-tables.sql", true ) );~~
344		~~- $updater->addExtensionUpdate( array( 'addIndex', "wikilog_comments",~~
345		~~- "wlc_timestamp", "{$dir}archives/patch-comments-indexes.sql", true ) );~~
346		~~- } else {~~
347		~~- // TODO: PostgreSQL, SQLite, etc...~~
348		~~- print "\n" .~~
349		~~- "Warning: There are no table structures for the Wikilog\n" .~~
350		~~- "extension other than for MySQL at this moment.\n\n";~~
351		~~- }~~
	347	+ // TODO: PostgreSQL, SQLite, etc...
	348	+ print "\n" .
	349	+ "Warning: There are no table structures for the Wikilog\n" .
	350	+ "extension other than for MySQL at this moment.\n\n";
352	351	}
353	352	return true;
354	353	}
Index: branches/REL1_18/extensions/Wikilog/TODO
—	—	@@ -2,11 +2,4 @@
3	3
4	4	=== Wikilog 1.3.0. ===
5	5
6		~~-* Drop support for Mw 1.16 and earlier.~~
7		~~-* Remove Mw1.16 compatibility boilerplate in:~~
8		~~- - WikilogFeed::loadFromCache() (bug 21916).~~
9		~~- - WikilogComment::getCommentArticleTitle() (GAID_FOR_UPDATE).~~
10		~~- - WikilogCommentsPage::setCommentApproval() (GAID_FOR_UPDATE).~~
11		~~-* Remove deprecated WikilogParserCache:~~
12		~~- - WikilogParserCache class definition in WikilogParser.php.~~
13		~~- - WikilogUtils::parsedArticle() in WikilogUtils.php.~~
	6	+* Remove WikilogItemPage::preSaveTransform() (Mw 1.17 compatibility).
Index: branches/REL1_18/extensions/Wikilog/RELEASE-NOTES
—	—	@@ -4,8 +4,8 @@
5	5
6	6	=== General notes ===
7	7
8		~~-MediaWiki requirement raised to 1.16.0 and later. MediaWiki 1.15 and earlier~~
9		~~-are no longer supported in this release.~~
	8	+MediaWiki requirement raised to 1.17.0 and later.
	9	+MediaWiki 1.16 and earlier are no longer supported in this release.
10	10
11	11	=== New configuration options ===
12	12
—	—	@@ -13,13 +13,18 @@
14	14
15	15	* Article and comment timestamps are now displayed in the wiki timezone
16	16	(as defined by $wgLocaltimezone).
	17	+* (wl:issue 11) Added support for {{DISPLAYTITLE:...}}, allows the author to
	18	+ alter the title of the wikilog article.
17	19
18	20	=== Bug fixes ===
19	21
20	22	* (mw:bug 27904) Fixed method signature compatibility with Mw1.16 for
21	23	WikilogParserCache.
	24	+* (wl:issue 12) Fixed calls to $wgParser->clearState() (which is now a private
	25	+ function).
	26	+* Fixed a crash when creating a new wikilog post as an unlogged user.
	27	+* Several fixes for compatibility with MediaWiki 1.18.
22	28
23		-
24	29	== Wikilog 1.1.0 ==
25	30
26	31	Aug 8, 2010
Index: branches/REL1_18/extensions/Wikilog/WikilogParser.php
—	—	@@ -472,7 +472,7 @@
473	473	}
474	474
475	475	$user = User::newFromName( $name );
476		~~- if ( !is_null( $user ) ) {~~
	476	+ if ( $user ) {
477	477	$parser->mExtWikilog->mAuthors[$user->getName()] = $user->getID();
478	478	}
479	479	else {
—	—	@@ -611,43 +611,3 @@
612	612	public function getAuthors() { return $this->mAuthors; }
613	613	public function getTags() { return $this->mTags; }
614	614	}
615		-
616		-/**
617		~~- * Since wikilog parses articles with specific options in order to be~~
618		~~- * rendered in feeds, it is necessary to store these parsed outputs in~~
619		~~- * the cache separately. This derived class from ParserCache overloads the~~
620		~~- * getKey() function in order to provide a specific namespace for this~~
621		~~- * purpose.~~
622		- *
623		~~- * @deprecated In MediaWiki 1.17, in favor of $parserOpt->addExtraKey().~~
624		~~- * @note MediaWiki 1.17 completely breaks this hack (in r70783). getKey() has~~
625		~~- * different parameters and very different implementation. Current version~~
626		~~- * is compatible with 1.16 and should only be used in that version, but may~~
627		~~- * issue warnings when used in 1.17. In 1.17, this class should never be~~
628		~~- * used due to the branch in WikilogUtils::parsedArticle(). It will be~~
629		~~- * removed anyways, as soon as we drop support for 1.16.~~
630		~~- * @todo (In Wikilog 1.3.x) Remove this class (see also WikilogUtils::parsedArticle()).~~
631		~~- */~~
632		~~-class WikilogParserCache~~
633		~~- extends ParserCache~~
634		-{
635		~~- public static function singleton() {~~
636		~~- static $instance;~~
637		~~- if ( !isset( $instance ) ) {~~
638		~~- global $parserMemc;~~
639		~~- $instance = new WikilogParserCache( $parserMemc );~~
640		~~- }~~
641		~~- return $instance;~~
642		~~- }~~
643		-
644		~~- public function getKey( $article, $popts ) {~~
645		~~- if ( $popts instanceof User ) // API change in MediaWiki 1.15.~~
646		~~- $popts = ParserOptions::newFromUser( $popts );~~
647		-
648		~~- $user = $popts->mUser;~~
649		~~- $pageid = intval( $article->getID() );~~
650		~~- $hash = $user->getPageRenderingHash();~~
651		~~- $key = wfMemcKey( 'wlcache', 'idhash', "$pageid-$hash" );~~
652		~~- return $key;~~
653		~~- }~~
654		-}
Index: branches/REL1_18/extensions/Wikilog/Wikilog.i18n.php
—	—	@@ -278,13 +278,16 @@
279	279	* $2 is the article's parent wikilog name (optional)
280	280	* $3 is a URL formatted link to the article
281	281	* $4 is the article title (optional)",
282		~~- 'wikilog-entry-footer' => 'Has the same parameters of {{msg-mw\|wikilog-summary-footer}}.',~~
283		~~- 'wikilog-simple-signature' => 'Parameters:~~
	282	+ 'wikilog-entry-footer' => '{{optional}}
	283	+Has the same parameters of {{msg-mw\|wikilog-summary-footer}}.',
	284	+ 'wikilog-simple-signature' => '{{optional}}
	285	+Parameters:
284	286	* $1 is a link to the commenting user page
285	287	* $2 is a link to the commenting user talk page, with {{msg-mw\|talkpagelinktext}} as link text',
286	288	'wikilog-edit-hint' => 'Parameters:
287	289	* $1 is an article title.',
288		~~- 'wikilog-comment-footer' => 'Parameters:~~
	290	+ 'wikilog-comment-footer' => '{{optional}}
	291	+Parameters:
289	292	* $1 is the name of the author of the comment (optional)
290	293	* $2 is the name of the author or the comment formatted with {{msg-mw\|wikilog-simple-signature\|notext=1}}
291	294	* $3 is the comment date
—	—	@@ -312,7 +315,8 @@
313	316	'wikilog-comment-autosumm' => 'Parameters:
314	317	* $1 is a user name
315	318	* $2 is a summary',
316		~~- 'wikilog-feed-title' => 'Parameters:~~
	319	+ 'wikilog-feed-title' => '{{optional}}
	320	+Parameters:
317	321	* $1 is a title
318	322	* $2 is the content language of the wiki',
319	323	'wikilog-feed-ns-title' => 'Parameters:
—	—	@@ -621,6 +625,7 @@
622	626	/** Arabic (العربية)
623	627	* @author Meno25
624	628	* @author OsamaK
	629	+ * @author روخو
625	630	*/
626	631	$messages['ar'] = array(
627	632	'wikilog-desc' => 'يضيف خصائص تدوين، منشئا تهجين ويكي-مدونة',
—	—	@@ -681,6 +686,7 @@
682	687	'wikilog-edit-signpub' => 'وقع وانشر هذه المقالة',
683	688	'wikilog-edit-signpub-tooltip' => 'يسبب هذه المقالة أن يتم توقيعها ونشرها في سجلها للويكي عند حفظها.
684	689	لا تعلم على هذا الصندوق لإبقاء المقالة كمسودة.',
	690	+ 'wikilog-comment-anonsig' => '$3 (مجهول)',
685	691	'wikilog-comment-pending' => 'هذا التعليق بانتظار الموافقة.',
686	692	'wikilog-comment-deleted' => 'هذا التعليق تم حذفه.',
687	693	'wikilog-comment-autosumm' => 'تعليق جديد بواسطة $1: $2',
—	—	@@ -734,7 +740,7 @@
735	741	'wikilog-show-published' => 'منشور',
736	742	'wikilog-show-drafts' => 'مسودات',
737	743	'wikilog-submit' => 'أرسل',
738		~~- 'wikilog-preview' => 'معاينة',~~
	744	+ 'wikilog-preview' => 'عاين',
739	745	'wikilog-edit-lc' => 'عدل',
740	746	'wikilog-reply-lc' => 'رد',
741	747	'wikilog-delete-lc' => 'احذف',
—	—	@@ -871,6 +877,31 @@
872	878	'wikilog-doc-import-comment' => 'استورد توثيق سجل الويكي',
873	879	);
874	880
	881	+/** Azerbaijani (Azərbaycanca)
	882	+ * @author Cekli829
	883	+ */
	884	+$messages['az'] = array(
	885	+ 'wikilog-pager-next' => 'növbəti',
	886	+ 'wikilog-pager-first' => 'birinci',
	887	+ 'wikilog-pager-last' => 'sonuncu',
	888	+ 'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|müzakirə]])',
	889	+ 'wikilog-title-comments' => 'Şərhlər - $1',
	890	+ 'wikilog-form-category' => 'Kateqoriya:',
	891	+ 'wikilog-form-name' => 'Ad:',
	892	+ 'wikilog-form-author' => 'Müəllif:',
	893	+ 'wikilog-form-date' => 'Tarix:',
	894	+ 'wikilog-form-status' => 'Status:',
	895	+ 'wikilog-form-comment' => 'Şərh:',
	896	+ 'wikilog-show-all' => 'Bütün postlar',
	897	+ 'wikilog-submit' => 'Təsdiq et',
	898	+ 'wikilog-preview' => 'Sınaq göstərişi',
	899	+ 'wikilog-edit-lc' => 'redaktə',
	900	+ 'wikilog-reply-lc' => 'yenidən',
	901	+ 'wikilog-delete-lc' => 'sil',
	902	+ 'wikilog-page-lc' => 'səhifə',
	903	+ 'wikilog-history-lc' => 'tarix',
	904	+);
	905	+
875	906	/** Belarusian (Беларуская)
876	907	* @author Тест
877	908	*/
—	—	@@ -1220,7 +1251,7 @@
1221	1252	'wikilog-wikilog' => 'Wikilog',
1222	1253	'wikilog-title' => 'Titl',
1223	1254	'wikilog-actions' => 'Oberoù',
1224		~~- 'wikilog-comments' => 'Addisplegoù',~~
	1255	+ 'wikilog-comments' => 'Evezhiadennoù',
1225	1256	'wikilog-replies' => 'Respontoù',
1226	1257	'wikilog-view-archives' => 'Dielloù',
1227	1258	'wikilog-view-summary' => 'Diverradur',
—	—	@@ -1902,7 +1933,7 @@
1903	1934	*/
1904	1935	$messages['de-formal'] = array(
1905	1936	'wikilog-comment-feed-description' => 'Lesen Sie die neuesten Kommentare dieses Feeds.',
1906		- 'wikilog-posting-anonymously' => 'Sie sind zur Zeit nicht angemeldet; Ihr Kommentar wird anonym versendet, identifiziert durch Ihre Internetverbindungsadresse. Sie sollten oben entweder ein Pseudonym angeben, um den Kommentar zu identifizieren oder sich $1, damit er passend zugeordnet wird.',
	1937	+ 'wikilog-posting-anonymously' => 'Sie sind zurzeit nicht angemeldet; Ihr Kommentar wird anonym versendet, identifiziert durch Ihre Internetverbindungsadresse. Sie sollten oben entweder ein Pseudonym angeben, um den Kommentar zu identifizieren oder sich $1, damit er passend zugeordnet wird.',
1907	1938	'wikilog-anonymous-moderated' => 'Nachdem Sie Ihren Kommentar absenden, wird er nicht sofort auf dieser Seite angezeigt.
1908	1939	Der Kommentar wird nur erscheinen, nachdem er von einem Moderator freigegeben wurde.',
1909	1940	);
—	—	@@ -3039,6 +3070,7 @@
3040	3071	'wikilog-form-category' => 'Κατηγορία:',
3041	3072	'wikilog-form-name' => 'Ὄνομα:',
3042	3073	'wikilog-form-author' => 'Δημιουργός:',
	3074	+ 'wikilog-form-date' => 'Ἡμερομηνία:',
3043	3075	'wikilog-form-comment' => 'Σχόλιον:',
3044	3076	'wikilog-edit-lc' => 'μεταγράφειν',
3045	3077	);
—	—	@@ -3880,8 +3912,8 @@
3881	3913	'wikilog-form-name' => 'Áhạ:',
3882	3914	'wikilog-form-author' => 'Ọdè ákwúkwó:',
3883	3915	'wikilog-form-date' => 'Ubọchị:',
3884		~~- 'wikilog-edit-lc' => 'rüwa',~~
3885		~~- 'wikilog-delete-lc' => 'gbakashia',~~
	3916	+ 'wikilog-edit-lc' => 'mèzi',
	3917	+ 'wikilog-delete-lc' => 'kàcha',
3886	3918	'wikilog-page-lc' => 'ihü',
3887	3919	'wikilog-history-lc' => 'akíkó mbu',
3888	3920	);
—	—	@@ -4335,7 +4367,7 @@
4336	4368	'wikilog-doc-import-comment' => 'Empoteet Handbooch för {{int:Wikilog-wikilog}}',
4337	4369	);
4338	4370
4339		~~-/** Kurdish (Latin) (Kurdî (Latin))~~
	4371	+/** Kurdish (Latin script) (‪Kurdî (latînî)‬)
4340	4372	* @author George Animal
4341	4373	*/
4342	4374	$messages['ku-latn'] = array(
—	—	@@ -4662,7 +4694,7 @@
4663	4695	'wikilog-comment-page' => 'Оди на страницата на овој коментар',
4664	4696	'wikilog-comment-edit' => 'Уреди го коментаров',
4665	4697	'wikilog-comment-delete' => 'Избриши го коментаров',
4666		~~- 'wikilog-comment-history' => 'Види историја на коментарот',~~
	4698	+ 'wikilog-comment-history' => 'Историја на коментирање',
4667	4699	'wikilog-comment-approve' => 'Одобри го коментарот (делува веднаш)',
4668	4700	'wikilog-comment-reject' => 'Одбиј го коментарот (делува веднаш)',
4669	4701	'wikilog-newtalk-text' => '<!-- празна страница создадена од Викидневникот -->',
—	—	@@ -4798,15 +4830,25 @@
4799	4831	'wikilog-authors' => 'Pengarang',
4800	4832	'wikilog-title' => 'Tajuk',
4801	4833	'wikilog-actions' => 'Tindakan',
	4834	+ 'wikilog-comments' => 'Komen',
4802	4835	'wikilog-view-summary' => 'Ringkasan',
	4836	+ 'wikilog-anonymous-mark' => '(tanpa nama)',
4803	4837	'wikilog-pager-prev' => 'sebelumnya',
4804	4838	'wikilog-pager-next' => 'berikutnya',
	4839	+ 'wikilog-has-comments' => '{{PLURAL:$1\|satu komen\|$1 komen}}',
	4840	+ 'wikilog-title-comments' => 'Komen - $1',
4805	4841	'wikilog-form-name' => 'Nama:',
4806	4842	'wikilog-form-author' => 'Pengarang:',
4807	4843	'wikilog-form-date' => 'Tarikh:',
	4844	+ 'wikilog-form-preview' => 'Pralihat:',
	4845	+ 'wikilog-form-comment' => 'Komen:',
	4846	+ 'wikilog-submit' => 'Serahkan',
	4847	+ 'wikilog-preview' => 'Pralihat',
	4848	+ 'wikilog-edit-lc' => 'sunting',
4808	4849	'wikilog-delete-lc' => 'hapuskan',
4809	4850	'wikilog-approve-lc' => 'luluskan',
4810	4851	'wikilog-page-lc' => 'laman',
	4852	+ 'wikilog-history-lc' => 'sejarah',
4811	4853	);
4812	4854
4813	4855	/** Nedersaksisch (Nedersaksisch)
—	—	@@ -5287,6 +5329,13 @@
5288	5330	'wikilog-doc-import-comment' => 'Documentacion importada de wikilog',
5289	5331	);
5290	5332
	5333	+/** Oriya (ଓଡ଼ିଆ)
	5334	+ * @author Psubhashish
	5335	+ */
	5336	+$messages['or'] = array(
	5337	+ 'wikilog-title' => 'ଶିରୋନାମା',
	5338	+);
	5339	+
5291	5340	/** Deitsch (Deitsch)
5292	5341	* @author Xqt
5293	5342	*/
—	—	@@ -5306,6 +5355,7 @@
5307	5356	'wikilog-form-comment' => 'Aamaericking:',
5308	5357	'wikilog-preview' => 'Devor aagucke',
5309	5358	'wikilog-edit-lc' => 'ennere',
	5359	+ 'wikilog-delete-lc' => 'lesche',
5310	5360	'wikilog-page-lc' => 'Blatt',
5311	5361	);
5312	5362
—	—	@@ -5602,7 +5652,7 @@
5603	5653	'wikilog-new-item-go' => 'جوړول',
5604	5654	'wikilog-item-name' => 'د ليکنې نوم:',
5605	5655	'wikilog-published' => 'خپاره شوي',
5606		~~- 'wikilog-updated' => 'اوسمهاله شو',~~
	5656	+ 'wikilog-updated' => 'اوسمهالېدلی',
5607	5657	'wikilog-draft' => 'مسوده',
5608	5658	'wikilog-authors' => 'ليکوالان',
5609	5659	'wikilog-wikilog' => 'ويکي يادښت',
—	—	@@ -5630,6 +5680,7 @@
5631	5681	'wikilog-comment-delete' => 'دا تبصره ړنګول',
5632	5682	'wikilog-comment-history' => 'د تبصرې پېښليک کتل',
5633	5683	'wikilog-title-comments' => 'تبصرې - $1',
	5684	+ 'wikilog-form-wikilog' => 'ويکي يادښتونه:',
5634	5685	'wikilog-form-category' => 'وېشنيزه:',
5635	5686	'wikilog-form-name' => 'نوم:',
5636	5687	'wikilog-form-author' => 'ليکوال:',
—	—	@@ -6483,18 +6534,29 @@
6484	6535	* @author Dbc334
6485	6536	*/
6486	6537	$messages['sl'] = array(
	6538	+ 'wikilog-desc' => 'Doda zmožnosti bloganja in ustvari križanec med wikijem in blogom',
6487	6539	'wikilog-auto' => 'Wikilog Samodejno',
6488	6540	'wikilog-help' => '{{ns:Help}}:Wikilog',
6489	6541	'right-wl-postcomment' => 'Objavljanje pripomb k člankom wikiloga',
	6542	+ 'right-wl-moderation' => 'Upravljanje pripomb člankov wikilog',
6490	6543	'wikilog-specialwikilog-title' => 'Wikilogi',
6491	6544	'wikilog-log-pagename' => 'Dnevnik dejanj Wikilog',
6492	6545	'wikilog-log-pagetext' => 'Spodaj se nahaja seznam dejanj wikiloga.',
6493		~~- 'wikilog-log-cmt-approve' => 'odobril(-a) pripombo »[[$1]]«',~~
6494		~~- 'wikilog-log-cmt-reject' => 'zavrnil(-a) pripombo »[[$1]]«',~~
	6546	+ 'wikilog-log-cmt-approve' => 'je odobril(-a) pripombo »[[$1]]«',
	6547	+ 'wikilog-log-cmt-reject' => 'je zavrnil(-a) pripombo »[[$1]]«',
6495	6548	'wikilog-log-cmt-rejdel' => 'Zavrnjena pripomba wikilog od [[Special:Contributions/$1\|$1]]',
6496	6549	'wikilog-tab' => 'Wikilog',
6497	6550	'wikilog-tab-title' => 'Dejanja Wikilog',
	6551	+ 'wikilog-missing-wikilog' => 'To je stran [[{{int:wikilog-help}}\|wikiloga]] za [[{{FULLPAGENAME}}]].
	6552	+
	6553	+Ta wikilog še ne obstaja.
	6554	+Če želite objavljati članke in omogočiti druge zmožnosti wikiloga, ga morate najprej ustvariti.
	6555	+
	6556	+* <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}\|action=edit}} Ustvari wikilog].</span>',
6498	6557	'wikilog-information' => 'Informacije wikiloga',
	6558	+ 'wikilog-post-count-published' => 'Na tem wikilogu {{PLURAL:$1\|je $1 objavljen članek\|sta $1 objavljena članka\|so $1 objavljeni članki\|je $1 objavljenih člankov}}',
	6559	+ 'wikilog-post-count-drafts' => '{{PLURAL:$1\|Obstaja $1 neobjavljen (osnutek) članka\|Obstajata $1 neobjavljena (osnutka) članka\|Obstajo $1 neobjavljeni (osnutki) člankov\|Obstaja $1 neobjavljenih (osnutkov) člankov}}',
	6560	+ 'wikilog-post-count-all' => 'Skupno {{PLURAL:$1\|je tukaj $1 članek\|sta tukaj $1 članka\|so tukaj $1 članki\|je tukaj $1 člankov}}.',
6499	6561	'wikilog-new-item' => 'Ustvari nov članek wikilog',
6500	6562	'wikilog-new-item-go' => 'Ustvari',
6501	6563	'wikilog-item-name' => 'Ime članka:',
—	—	@@ -6520,6 +6582,8 @@
6521	6583	'wikilog-pager-empty' => '(ni predmetov)',
6522	6584	'wikilog-no-comments' => 'ni pripomb',
6523	6585	'wikilog-has-comments' => '$1 {{PLURAL:$1\|pripomba\|pripombi\|pripombe\|pripomb}}',
	6586	+ 'wikilog-summary-footer' => '{{PLURAL:$5\|Objavil\|Objavila\|Objavili}} $7 na [[$1\|$2]] dne $8 ob $9 ($15), $10.',
	6587	+ 'wikilog-summary-footer-single' => '{{PLURAL:$5\|Objavil\|Objavila\|Objavili}} $7 dne $8 ob $9 ($15), $10.',
6524	6588	'wikilog-summary-uncategorized' => 'Nekategorizirano',
6525	6589	'wikilog-summary-categories' => 'Vloženo pod $2',
6526	6590	'wikilog-summary-more' => '[[$3\|→ nadaljujte z branjem ...]]',
—	—	@@ -6527,6 +6591,8 @@
6528	6592	'wikilog-edit-hint' => 'Uredi članek wikiloga: $1',
6529	6593	'wikilog-edit-fieldset-legend' => 'Možnosti wikiloga:',
6530	6594	'wikilog-edit-signpub' => 'Podpiši in objavi ta članek',
	6595	+ 'wikilog-edit-signpub-tooltip' => 'Ob shranitvi povzroči podpis in objavo tega članka na njegovem wikilogu.
	6596	+Počistite to polje, da obdržite članek kot osnutek.',
6531	6597	'wikilog-comment-permalink' => '$1 ob $2',
6532	6598	'wikilog-comment-note-item' => 'objavljeno na $1',
6533	6599	'wikilog-comment-note-edited' => 'nazadnje urejeno dne $1 ob $2',
—	—	@@ -6559,6 +6625,8 @@
6560	6626	'wikilog-invalid-file' => 'Neveljavna datoteka: $1',
6561	6627	'wikilog-file-not-found' => 'Neobstoječa datoteka: $1.',
6562	6628	'wikilog-not-an-image' => 'Datoteka ni slika: $1.',
	6629	+ 'wikilog-out-of-context' => 'Opozorilo: oznake Wikilog uporabljate izven konteksta.
	6630	+Uporabljene naj bodo samo v člankih v imenskem prostoru Wikilog.',
6563	6631	'wikilog-too-many-authors' => 'Opozorilo: V tej objavi wikilog je navedenih preveč avtorjev.',
6564	6632	'wikilog-too-many-tags' => 'Opozorilo: V tej objavi wikilog je navedenih preveč oznak.',
6565	6633	'wikilog-comment-is-empty' => 'Objavljena pripomba je prazna.',
—	—	@@ -6566,6 +6634,11 @@
6567	6635	'wikilog-comment-invalid-name' => 'Navedeno ime je neveljavno.',
6568	6636	'wikilog-no-such-article' => 'Zahtevan članek wikilog ne obstaja.',
6569	6637	'wikilog-reading-draft' => 'Ta članek wikilog je osnutek; ni še bil objavljen.',
	6638	+ 'wikilog-posting-anonymously' => 'Trenutno niste prijavljeni;
	6639	+vaš komentar bo objavljen brezimno, identificiran z vašim naslovom internetne povezave.
	6640	+Zgoraj raje navedite svoj vzdevek, da identificirate svojo pripombo; če pa želite, da je pravilno pripisana, se morate $1.',
	6641	+ 'wikilog-anonymous-moderated' => 'Ko oddate svojo pripombo, ne bo takoj vidna na tej strani.
	6642	+Pripomba bo prikazana šele takrat, ko jo pregleda moderator.',
6570	6643	'wikilog-post-comment' => 'Objavi novo pripombo',
6571	6644	'wikilog-post-reply' => 'Objavi nov odgovor',
6572	6645	'wikilog-form-legend' => 'Iskanje objav wikilog',
—	—	@@ -6600,7 +6673,7 @@
6601	6674	'wikilog-form-category' => 'Qeybta:',
6602	6675	);
6603	6676
6604		~~-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)~~
	6677	+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
6605	6678	* @author Rancher
6606	6679	* @author Жељко Тодоровић
6607	6680	* @author Михајло Анђелковић
—	—	@@ -6633,7 +6706,10 @@
6634	6707	'wikilog-summary-footer-single' => 'Послао/-ла $7 ка $8 у $9 ($15), $10.',
6635	6708	'wikilog-summary-uncategorized' => 'Некатегорисано',
6636	6709	'wikilog-summary-categories' => 'Заведено под $2',
	6710	+ 'wikilog-entry-footer' => '— $7 • $9, $8 • $10',
	6711	+ 'wikilog-simple-signature' => '$1 ($2)',
6637	6712	'wikilog-edit-signpub' => 'Потпиши и објави овај чланак',
	6713	+ 'wikilog-comment-footer' => '— $2 • $5 $6',
6638	6714	'wikilog-comment-permalink' => '$1 у $2',
6639	6715	'wikilog-comment-note-item' => 'послато на $1',
6640	6716	'wikilog-comment-note-edited' => 'последње измењен на $1 у $2',
—	—	@@ -6645,9 +6721,11 @@
6646	6722	'wikilog-comment-delete' => 'Обриши овај коментар',
6647	6723	'wikilog-comment-history' => 'Види историју коментара',
6648	6724	'wikilog-comment-approve' => 'Одобри овај коментар (моментална акција)',
	6725	+ 'wikilog-feed-title' => '{{SITENAME}} – $1 [$2]',
6649	6726	'wikilog-feed-description' => 'Прочитај најскорије уносе у овом фиду.',
6650	6727	'wikilog-comment-feed-title1' => 'Коментар од $2 (#$1)',
6651	6728	'wikilog-comment-feed-title2' => 'Коментар од $2 за $3 (#$1)',
	6729	+ 'wikilog-title-item-full' => '$1 – $2',
6652	6730	'wikilog-title-comments' => 'Коментари - $1',
6653	6731	'wikilog-invalid-param' => 'Неисправан параметар: $1.',
6654	6732	'wikilog-invalid-author' => 'Непостојећи аутор: $1.',
—	—	@@ -6683,7 +6761,7 @@
6684	6762	'wikilog-history-lc' => 'историја',
6685	6763	);
6686	6764
6687		~~-/** Serbian Latin ekavian (‪Srpski (latinica)‬)~~
	6765	+/** Serbian (Latin script) (‪Srpski (latinica)‬)
6688	6766	* @author Rancher
6689	6767	*/
6690	6768	$messages['sr-el'] = array(
—	—	@@ -7228,6 +7306,7 @@
7229	7307	);
7230	7308
7231	7309	/** Turkish (Türkçe)
	7310	+ * @author Emperyan
7232	7311	* @author Homonihilis
7233	7312	* @author Manco Capac
7234	7313	* @author Universal Life
—	—	@@ -7288,10 +7367,12 @@
7289	7368	'wikilog-summary-categories' => '$2 altına yerleştirilmiştir',
7290	7369	'wikilog-summary-more' => '[[$3\|→ okumaya devam edin...]]',
7291	7370	'wikilog-author-signature' => '[[{{ns:User}}:$1\|$1]] ([[{{ns:User_talk}}:$1\|tartışma]])',
	7371	+ 'wikilog-edit-hint' => 'Wikilog maddesini düzenleyin: $1',
7292	7372	'wikilog-edit-fieldset-legend' => 'Vikikayıt seçenekleri:',
7293	7373	'wikilog-edit-signpub' => 'Bu maddeyi imzala ve yayınla',
7294	7374	'wikilog-edit-signpub-tooltip' => 'Kaydedildiğinde bu maddenin imzalanmasını ve vikikaydında yayımlanmasını sağlar.
7295	7375	Bu maddeyi taslak olarak tutmak için bu kutunun seçimini kaldırın.',
	7376	+ 'wikilog-comment-anonsig' => '$3 (anonim)',
7296	7377	'wikilog-comment-pending' => 'Bu yorum onay beklemektedir.',
7297	7378	'wikilog-comment-deleted' => 'Bu yorum silindi.',
7298	7379	'wikilog-comment-autosumm' => '$1 tarafından yapılan yeni yorum: $2',
Index: branches/REL1_18/extensions/Wikilog/WikilogUtils.php
—	—	@@ -59,9 +59,6 @@
60	60	* parser that we could mess up without interfering with normal page
61	61	* rendering, and we can't create a new instance because of too many
62	62	* broken extensions around. Check self::parserSanityCheck().
63		- *
64		~~- * @todo (In Wikilog 1.3.x) Remove deprecated WikilogParserCache~~
65		~~- * in favor of ParserOptions::addExtraKey().~~
66	63	*/
67	64	public static function parsedArticle( Title $title, $feed = false ) {
68	65	global $wgWikilogCloneParser;
—	—	@@ -84,13 +81,7 @@
85	82	if ( $feed ) {
86	83	$parserOpt->setEditSection( false );
87	84
88		~~- # NOTE (Mw1.16- COMPAT) ParserOptions::addExtraKey() added in~~
89		~~- # MediaWiki 1.17 (r70822) makes WikilogParserCache obsolete.~~
90		~~- if ( method_exists( $parserOpt, 'addExtraKey' ) ) {~~
91		~~- $parserOpt->addExtraKey( "WikilogFeed" );~~
92		~~- } else {~~
93		~~- $parserCache = WikilogParserCache::singleton();~~
94		~~- }~~
	85	+ $parserOpt->addExtraKey( "WikilogFeed" );
95	86	} else {
96	87	$parserOpt->enableLimitReport();
97	88	}
Index: branches/REL1_18/extensions/Wikilog/WikilogComment.php
—	—	@@ -29,12 +29,6 @@
30	30	if ( !defined( 'MEDIAWIKI' ) )
31	31	die();
32	32
33		~~-# NOTE (Mw1.16- COMPAT): GAID_FOR_UPDATE removed and replaced by~~
34		~~-# Title::GAID_FOR_UPDATE in Mw1.17. Remove this define and replace its~~
35		~~-# occurrence WikilogComment::getCommentArticleTitle() in Wl1.3.~~
36		~~-if ( !defined( 'GAID_FOR_UPDATE' ) )~~
37		~~- define( 'GAID_FOR_UPDATE', Title::GAID_FOR_UPDATE );~~
38		-
39	33	/**
40	34	* Wikilog article comment database entry.
41	35	*/
—	—	@@ -244,14 +238,12 @@
245	239
246	240	/**
247	241	* Returns comment article title.
248		~~- * @todo (In Wikilog 1.3.x) Replace GAID_FOR_UPDATE with~~
249		~~- * Title::GAID_FOR_UPDATE.~~
250	242	*/
251	243	public function getCommentArticleTitle() {
252	244	if ( $this->mCommentTitle ) {
253	245	return $this->mCommentTitle;
254	246	} elseif ( $this->mCommentPage ) {
255		~~- return Title::newFromID( $this->mCommentPage, GAID_FOR_UPDATE );~~
	247	+ return Title::newFromID( $this->mCommentPage, Title::GAID_FOR_UPDATE );
256	248	} else {
257	249	$it = $this->mItem->mTitle;
258	250	return Title::makeTitle(
Property changes on: branches/REL1_18/extensions/Wikilog
___________________________________________________________________
Added: svn:mergeinfo
259	251	Merged /trunk/extensions/Wikilog:r92476-104803

Status & tagging log

17:24, 10 December 2011 Reedy (talk | contribs) changed the status of r104804 [removed: new added: deferred]