Attachment #145145 for bug #188684

Lines 3-12 Link Here

(-)./Makefile (-1 / +2 lines)
3		3
4	CATEGORIES= russian www	4	CATEGORIES= russian www
5	MASTER_SITES= http://movable-type.ru/downloads/	5	MASTER_SITES= http://movable-type.ru/downloads/
6	DISTNAME= MTOS-${PORTVERSION}-${PKGNAMEPREFIX:S,-,,}	6	DISTNAME= MTOS-5.2.9-${PKGNAMEPREFIX:S,-,,}
7		7
8	COMMENT= Russian localization of the MovableType publishing system	8	COMMENT= Russian localization of the MovableType publishing system
9		9
		10	PATCHDIR= ${.CURDIR}/files
10	MASTERDIR= ${.CURDIR}/../../www/MT	11	MASTERDIR= ${.CURDIR}/../../www/MT
11	MT_LANG= ${PKGNAMEPREFIX:S,-,,U}	12	MT_LANG= ${PKGNAMEPREFIX:S,-,,U}
12	CONFLICTS= MT-[2-5].* de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].*	13	CONFLICTS= MT-[2-5].* de-MT-[2-5].* fr-MT-[2-5].* ja-MT-[2-5].*

Line 0 Link Here

(-)./files/patch-default_templates__comment_response.mtml (+11 lines)
	1	--- default_templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900
	2	+++ default_templates/comment_response.mtml 2014-04-16 15:17:26.000000000 +0900
	3	@@ -15,7 +15,7 @@
	4	<mt:Else name="comment_error">
	5	<mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
	6	<$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
	7	- <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
	8	+ <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
	9	</mt:If>
	10
	11

Line 0 Link Here

(-)./files/patch-lib__MT.pm (+31 lines)
	1	--- lib/MT.pm.orig 2013-12-02 02:40:30.000000000 +0900
	2	+++ lib/MT.pm 2014-04-16 15:18:36.000000000 +0900
	3	@@ -39,8 +39,8 @@
	4	)
	5	= (
	6	'Movable Type', 'MT',
	7	- '5.2.9', '5.2.9-ru',
	8	- '9', 'http://movable-type.ru/'
	9	+ '5.2.10', '5.2.10-ru',
	10	+ '10', 'http://movable-type.ru/'
	11	);
	12
	13	# To allow MT to run straight from svn, if no build process (pre-processing)
	14	@@ -56,7 +56,7 @@
	15	}
	16
	17	if ( $RELEASE_NUMBER eq '__RELEASE' . '_NUMBER__' ) {
	18	- $RELEASE_NUMBER = 9;
	19	+ $RELEASE_NUMBER = 10;
	20	}
	21
	22	$DebugMode = 0;
	23	@@ -124,7 +124,7 @@
	24	}
	25
	26	sub build_id {
	27	- my $build_id = '5.2.9-ru';
	28	+ my $build_id = '5.2.10-ru';
	29	$build_id = '' if $build_id eq '__BUILD_' . 'ID__';
	30	return $build_id;
	31	}

Line 0 Link Here

(-)./files/patch-mt-check.cgi (+14 lines)
	1	--- mt-check.cgi.orig 2013-12-02 02:40:30.000000000 +0900
	2	+++ mt-check.cgi 2014-04-16 15:19:09.000000000 +0900
	3	@@ -97,9 +97,9 @@
	4	my $view = $cgi->param("view");
	5	my $version = $cgi->param("version");
	6	my $sess_id = $cgi->param('session_id');
	7	-$version \|\|= '5.2.9-ru';
	8	+$version \|\|= '5.2.10-ru';
	9	if ( $version eq '__PRODUCT_VERSION' . '_ID__' ) {
	10	- $version = '5.2.9';
	11	+ $version = '5.2.10';
	12	}
	13
	14	my ( $mt, $LH );

Line 0 Link Here

(-)./files/patch-mt-static__css__main.css (+8 lines)
	1	--- mt-static/css/main.css.orig 2013-12-02 02:40:33.000000000 +0900
	2	+++ mt-static/css/main.css 2014-04-16 15:19:43.000000000 +0900
	3	@@ -1,4 +1,4 @@
	4	-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
	5	+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
	6	* This file is combined from multiple sources. Consult the source files for their
	7	* respective licenses and copyrights.
	8	*/html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,

Line 0 Link Here

(-)./files/patch-mt-static__css__simple.css (+8 lines)
	1	--- mt-static/css/simple.css.orig 2013-12-02 02:40:34.000000000 +0900
	2	+++ mt-static/css/simple.css 2014-04-16 15:20:06.000000000 +0900
	3	@@ -1,4 +1,4 @@
	4	-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
	5	+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
	6	* This file is combined from multiple sources. Consult the source files for their
	7	* respective licenses and copyrights.
	8	*/html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,

Line 0 Link Here

(-)./files/patch-mt-static__js__editor.js (+8 lines)
	1	--- mt-static/js/editor.js.orig 2013-12-02 02:40:32.000000000 +0900
	2	+++ mt-static/js/editor.js 2014-04-16 15:20:42.000000000 +0900
	3	@@ -1,4 +1,4 @@
	4	-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
	5	+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
	6	* This file is combined from multiple sources. Consult the source files for their
	7	* respective licenses and copyrights.
	8	*/;(function($){MT.EditorManager=function(){this.init.apply(this,arguments);};$.extend(MT.EditorManager,{editors:{},editorsForFormat:{},map:{},defaultWrapTag:'div',defaultWrapClass:'mt-editor-manager-wrap',register:function(id,editor){var thisConstructor=this;this.editors[id]=editor;$.each(editor.formatsForCurrentContext(),function(){if(!thisConstructor.editorsForFormat[this]){thisConstructor.editorsForFormat[this]=[];}

Line 0 Link Here

(-)./files/patch-mt-static__js__mt_core_compact.js (+8 lines)
	1	--- mt-static/js/mt_core_compact.js.orig 2013-12-02 02:40:32.000000000 +0900
	2	+++ mt-static/js/mt_core_compact.js 2014-04-16 15:21:04.000000000 +0900
	3	@@ -1,4 +1,4 @@
	4	-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
	5	+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
	6	* This file is combined from multiple sources. Consult the source files for their
	7	* respective licenses and copyrights.
	8	*/defined=function(x){return x!==undefined;};exists=function(x){return(x===undefined\|\|x===null)?false:true;};truth=function(x){return(x&&x!="0")?true:false;};finite=function(x){return isFinite(x)?x:0;};finiteInt=function(x,b){return finite(parseInt(x,b));};finiteFloat=function(x){return finite(parseFloat(x));};max=function(){var a=arguments;var n=a[0];for(var i=1;i<a.length;i++)




--- php/mt.php.orig	2013-12-02 02:40:30.000000000 +0900
+++ php/mt.php	2014-04-16 15:21:49.000000000 +0900
@@ -11,16 +11,16 @@
 require_once('lib/class.exception.php');
 
 define('VERSION', '5.2');
-define('PRODUCT_VERSION', '5.2.9');
+define('PRODUCT_VERSION', '5.2.10');
 
 $PRODUCT_NAME = 'Movable Type';
 if($PRODUCT_NAME == '__PRODUCT' . '_NAME__')
     $PRODUCT_NAME = 'Movable Type';
 define('PRODUCT_NAME', $PRODUCT_NAME);
 
-$RELEASE_NUMBER = '9';
+$RELEASE_NUMBER = '10';
 if ( $RELEASE_NUMBER == '__RELEASE_' . 'NUMBER__' )
-    $RELEASE_NUMBER = 9;
+    $RELEASE_NUMBER = 10;
 define('RELEASE_NUMBER', $RELEASE_NUMBER);
 
 $PRODUCT_VERSION_ID = '5.2.9-ru';

Line 0 Link Here

(-)./files/patch-themes__classic_blog__templates__comment_response.mtml (+11 lines)
	1	--- themes/classic_blog/templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900
	2	+++ themes/classic_blog/templates/comment_response.mtml 2014-04-16 15:22:52.000000000 +0900
	3	@@ -15,7 +15,7 @@
	4	<mt:Else name="comment_error">
	5	<mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
	6	<$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
	7	- <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
	8	+ <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
	9	</mt:If>
	10
	11

Line 0 Link Here

(-)./files/patch-themes__classic_blog__theme.yaml (+11 lines)
	1	--- themes/classic_blog/theme.yaml.orig 2013-12-02 02:38:32.000000000 +0900
	2	+++ themes/classic_blog/theme.yaml 2014-04-16 15:23:26.000000000 +0900
	3	@@ -2,7 +2,7 @@
	4	id: classic_blog
	5	author_name: Six Apart, Ltd.
	6	author_link: http://www.movabletype.org/
	7	-version: 1.11
	8	+version: 1.12
	9	class: blog
	10	protected: 1
	11	description: <__trans phrase="A traditional blogging design that comes with plenty of styles and a selection of 2 column / 3 column layouts. Best for use in standard blog publishing applications.">

Line 0 Link Here

(-)./files/patch-themes__classic_website__templates__comment_response.mtml (+11 lines)
	1	--- themes/classic_website/templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900
	2	+++ themes/classic_website/templates/comment_response.mtml 2014-04-16 15:25:24.000000000 +0900
	3	@@ -15,7 +15,7 @@
	4	<mt:Else name="comment_error">
	5	<mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
	6	<$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
	7	- <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
	8	+ <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
	9	</mt:If>
	10
	11

Line 0 Link Here

(-)./files/patch-themes__classic_website__theme.yaml (+11 lines)
	1	--- themes/classic_website/theme.yaml.orig 2013-12-02 02:38:32.000000000 +0900
	2	+++ themes/classic_website/theme.yaml 2014-04-16 15:25:48.000000000 +0900
	3	@@ -2,7 +2,7 @@
	4	id: classic_website
	5	author_name: Six Apart, Ltd.
	6	author_link: http://www.movabletype.org/
	7	-version: 1.11
	8	+version: 1.12
	9	class: website
	10	protected: 1
	11	description: <__trans phrase="Create a blog portal that aggregates contents from several blogs in one website.">




--- themes/pico/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
+++ themes/pico/templates/comment_response.mtml	2014-04-16 15:26:22.000000000 +0900
@@ -16,7 +16,8 @@
 <mt:Else name="comment_error">
     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
+    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
+ </mt:If>
 </mt:If>
 
 

Line 0 Link Here

(-)./files/patch-themes__pico__theme.yaml (+11 lines)
	1	--- themes/pico/theme.yaml.orig 2013-12-02 02:38:33.000000000 +0900
	2	+++ themes/pico/theme.yaml 2014-04-16 15:26:41.000000000 +0900
	3	@@ -2,7 +2,7 @@
	4	id: pico
	5	author_name: Six Apart, Ltd.
	6	author_link: http://www.movabletype.org/
	7	-version: 1.11
	8	+version: 1.12
	9	class: blog
	10	protected: 1
	11	description: <__trans phrase="Pico is a microblogging theme, designed for keeping things simple to handle frequent updates. To put the focus on content we've moved the sidebars below the list of posts.">

Line 0 Link Here

(-)./files/patch-themes__rainier__templates__comment_response.mtml (+11 lines)
	1	--- themes/rainier/templates/comment_response.mtml.orig 2013-12-02 02:38:33.000000000 +0900
	2	+++ themes/rainier/templates/comment_response.mtml 2014-04-16 15:27:29.000000000 +0900
	3	@@ -6,7 +6,7 @@
	4	<$mt:Var name="message" value="<p class="message success"><__trans phrase="Your comment has been received and held for review by a blog administrator."></p>"$>
	5	<mt:Else name="comment_error">
	6	<$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
	7	- <mt:SetVarBlock name="message"><p class="message error"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
	8	+ <mt:SetVarBlock name="message"><p class="message error"><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
	9	</mt:If>
	10	<!DOCTYPE html>
	11	<html>

Line 0 Link Here

(-)./files/patch-themes__rainier__theme.yaml (+10 lines)
	1	--- themes/rainier/theme.yaml.orig 2013-12-02 02:38:33.000000000 +0900
	2	+++ themes/rainier/theme.yaml 2014-04-16 15:27:46.000000000 +0900
	3	@@ -1,6 +1,6 @@
	4	label: 'Rainier'
	5	id: 'rainier'
	6	-version: 1.03
	7	+version: 1.04
	8	author_link: 'http://www.sixapart.com/'
	9	author_name: 'Six Apart, Ltd.'
	10	class: 'blog'

Return to bug 188684

Line 0 Link Here

(-)./files/patch-php__mt.php (+22 lines)
	1	--- php/mt.php.orig 2013-12-02 02:40:30.000000000 +0900
	2	+++ php/mt.php 2014-04-16 15:21:49.000000000 +0900
	3	@@ -11,16 +11,16 @@
	4	require_once('lib/class.exception.php');
	5
	6	define('VERSION', '5.2');
	7	-define('PRODUCT_VERSION', '5.2.9');
	8	+define('PRODUCT_VERSION', '5.2.10');
	9
	10	$PRODUCT_NAME = 'Movable Type';
	11	if($PRODUCT_NAME == '__PRODUCT' . '_NAME__')
	12	$PRODUCT_NAME = 'Movable Type';
	13	define('PRODUCT_NAME', $PRODUCT_NAME);
	14
	15	-$RELEASE_NUMBER = '9';
	16	+$RELEASE_NUMBER = '10';
	17	if ( $RELEASE_NUMBER == '__RELEASE_' . 'NUMBER__' )
	18	- $RELEASE_NUMBER = 9;
	19	+ $RELEASE_NUMBER = 10;
	20	define('RELEASE_NUMBER', $RELEASE_NUMBER);
	21
	22	$PRODUCT_VERSION_ID = '5.2.9-ru';

Line 0 Link Here

(-)./files/patch-themes__pico__templates__comment_response.mtml (+12 lines)
	1	--- themes/pico/templates/comment_response.mtml.orig 2013-12-02 02:38:32.000000000 +0900
	2	+++ themes/pico/templates/comment_response.mtml 2014-04-16 15:26:22.000000000 +0900
	3	@@ -16,7 +16,8 @@
	4	<mt:Else name="comment_error">
	5	<mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
	6	<$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
	7	- <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
	8	+ <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage encode_html="1"$>"></p></mt:SetVarBlock>
	9	+ </mt:If>
	10	</mt:If>
	11
	12