PATCHDIR=	${.CURDIR}/files

--- default_templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900

+++ default_templates/comment_response.mtml	2014-04-16 15:17:26.000000000 +0900

@@ -15,7 +15,7 @@

 <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>

--- lib/MT.pm.orig	2013-12-02 02:40:30.000000000 +0900

+++ lib/MT.pm	2014-04-16 15:18:36.000000000 +0900

@@ -39,8 +39,8 @@

         )

         = (

         'Movable Type',   'MT',

-        '5.2.9',              '5.2.9-ru',

-        '9', 'http://movable-type.ru/'

+        '5.2.10',              '5.2.10-ru',

+        '10', 'http://movable-type.ru/'

         );

   # To allow MT to run straight from svn, if no build process (pre-processing)

@@ -56,7 +56,7 @@

     }

     if ( $RELEASE_NUMBER eq '__RELEASE' . '_NUMBER__' ) {

-        $RELEASE_NUMBER = 9;

+        $RELEASE_NUMBER = 10;

     }

     $DebugMode = 0;

@@ -124,7 +124,7 @@

 }

 sub build_id {

-    my $build_id = '5.2.9-ru';

+    my $build_id = '5.2.10-ru';

     $build_id = '' if $build_id eq '__BUILD_' . 'ID__';

     return $build_id;

 }

--- mt-check.cgi.orig	2013-12-02 02:40:30.000000000 +0900

+++ mt-check.cgi	2014-04-16 15:19:09.000000000 +0900

@@ -97,9 +97,9 @@

 my $view    = $cgi->param("view");

 my $version = $cgi->param("version");

 my $sess_id = $cgi->param('session_id');

-$version ||= '5.2.9-ru';

+$version ||= '5.2.10-ru';

 if ( $version eq '__PRODUCT_VERSION' . '_ID__' ) {

-    $version = '5.2.9';

+    $version = '5.2.10';

 }

 my ( $mt, $LH );

--- mt-static/js/editor.js.orig	2013-12-02 02:40:32.000000000 +0900

+++ mt-static/js/editor.js	2014-04-16 15:20:42.000000000 +0900

@@ -1,4 +1,4 @@

-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.

+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.

  * This file is combined from multiple sources.  Consult the source files for their

  * respective licenses and copyrights.

  */;(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]=[];}

--- mt-static/js/mt_core_compact.js.orig	2013-12-02 02:40:32.000000000 +0900

+++ mt-static/js/mt_core_compact.js	2014-04-16 15:21:04.000000000 +0900

@@ -1,4 +1,4 @@

-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.

+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.

  * This file is combined from multiple sources.  Consult the source files for their

  * respective licenses and copyrights.

  */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++)

--- mt-static/css/main.css.orig	2013-12-02 02:40:33.000000000 +0900

+++ mt-static/css/main.css	2014-04-16 15:19:43.000000000 +0900

@@ -1,4 +1,4 @@

-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.

+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.

  * This file is combined from multiple sources.  Consult the source files for their

  * respective licenses and copyrights.

  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,

--- mt-static/css/simple.css.orig	2013-12-02 02:40:34.000000000 +0900

+++ mt-static/css/simple.css	2014-04-16 15:20:06.000000000 +0900

@@ -1,4 +1,4 @@

-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.

+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.

  * This file is combined from multiple sources.  Consult the source files for their

  * respective licenses and copyrights.

  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,

--- 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';

--- themes/classic_blog/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900

+++ themes/classic_blog/templates/comment_response.mtml	2014-04-16 15:22:52.000000000 +0900

@@ -15,7 +15,7 @@

 <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>

--- themes/classic_blog/theme.yaml.orig	2013-12-02 02:38:32.000000000 +0900

+++ themes/classic_blog/theme.yaml	2014-04-16 15:23:26.000000000 +0900

@@ -2,7 +2,7 @@

 id: classic_blog

 author_name: Six Apart, Ltd.

 author_link: http://www.movabletype.org/

-version: 1.11

+version: 1.12

 class: blog

 protected: 1

 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.">

--- 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>

--- themes/pico/theme.yaml.orig	2013-12-02 02:38:33.000000000 +0900

+++ themes/pico/theme.yaml	2014-04-16 15:26:41.000000000 +0900

@@ -2,7 +2,7 @@

 id: pico

 author_name: Six Apart, Ltd.

 author_link: http://www.movabletype.org/

-version: 1.11

+version: 1.12

 class: blog

 protected: 1

 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.">

--- themes/rainier/templates/comment_response.mtml.orig	2013-12-02 02:38:33.000000000 +0900

+++ themes/rainier/templates/comment_response.mtml	2014-04-16 15:27:29.000000000 +0900

@@ -6,7 +6,7 @@

   <$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>"$>

 <mt:Else name="comment_error">

   <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>

-  <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>

+  <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>

 </mt:If>

 <!DOCTYPE html>

 <html>

--- themes/rainier/theme.yaml.orig	2013-12-02 02:38:33.000000000 +0900

+++ themes/rainier/theme.yaml	2014-04-16 15:27:46.000000000 +0900

@@ -1,6 +1,6 @@

 label: 'Rainier'

 id: 'rainier'

-version: 1.03

+version: 1.04

 author_link: 'http://www.sixapart.com/'

 author_name: 'Six Apart, Ltd.'

 class: 'blog'

--- themes/classic_website/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900

+++ themes/classic_website/templates/comment_response.mtml	2014-04-16 15:25:24.000000000 +0900

@@ -15,7 +15,7 @@

 <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>

--- themes/classic_website/theme.yaml.orig	2013-12-02 02:38:32.000000000 +0900

+++ themes/classic_website/theme.yaml	2014-04-16 15:25:48.000000000 +0900

@@ -2,7 +2,7 @@

 id: classic_website

 author_name: Six Apart, Ltd.

 author_link: http://www.movabletype.org/

-version: 1.11

+version: 1.12

 class: website

 protected: 1

 description: <__trans phrase="Create a blog portal that aggregates contents from several blogs in one website.">