View | Details | Raw Unified | Return to bug 188684 | Differences between
and this patch

Collapse All | Expand All

(-)./files/patch-aa (+198 lines)
Line 0 Link Here
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
12
--- lib/MT.pm.orig	2013-12-02 02:40:30.000000000 +0900
13
+++ lib/MT.pm	2014-04-16 15:18:36.000000000 +0900
14
@@ -39,8 +39,8 @@
15
         )
16
         = (
17
         'Movable Type',   'MT',
18
-        '5.2.9',              '5.2.9-ru',
19
-        '9', 'http://movable-type.ru/'
20
+        '5.2.10',              '5.2.10-ru',
21
+        '10', 'http://movable-type.ru/'
22
         );
23
24
   # To allow MT to run straight from svn, if no build process (pre-processing)
25
@@ -56,7 +56,7 @@
26
     }
27
28
     if ( $RELEASE_NUMBER eq '__RELEASE' . '_NUMBER__' ) {
29
-        $RELEASE_NUMBER = 9;
30
+        $RELEASE_NUMBER = 10;
31
     }
32
33
     $DebugMode = 0;
34
@@ -124,7 +124,7 @@
35
 }
36
37
 sub build_id {
38
-    my $build_id = '5.2.9-ru';
39
+    my $build_id = '5.2.10-ru';
40
     $build_id = '' if $build_id eq '__BUILD_' . 'ID__';
41
     return $build_id;
42
 }
43
--- mt-check.cgi.orig	2013-12-02 02:40:30.000000000 +0900
44
+++ mt-check.cgi	2014-04-16 15:19:09.000000000 +0900
45
@@ -97,9 +97,9 @@
46
 my $view    = $cgi->param("view");
47
 my $version = $cgi->param("version");
48
 my $sess_id = $cgi->param('session_id');
49
-$version ||= '5.2.9-ru';
50
+$version ||= '5.2.10-ru';
51
 if ( $version eq '__PRODUCT_VERSION' . '_ID__' ) {
52
-    $version = '5.2.9';
53
+    $version = '5.2.10';
54
 }
55
56
 my ( $mt, $LH );
57
--- mt-static/js/editor.js.orig	2013-12-02 02:40:32.000000000 +0900
58
+++ mt-static/js/editor.js	2014-04-16 15:20:42.000000000 +0900
59
@@ -1,4 +1,4 @@
60
-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
61
+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
62
  * This file is combined from multiple sources.  Consult the source files for their
63
  * respective licenses and copyrights.
64
  */;(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]=[];}
65
--- mt-static/js/mt_core_compact.js.orig	2013-12-02 02:40:32.000000000 +0900
66
+++ mt-static/js/mt_core_compact.js	2014-04-16 15:21:04.000000000 +0900
67
@@ -1,4 +1,4 @@
68
-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
69
+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
70
  * This file is combined from multiple sources.  Consult the source files for their
71
  * respective licenses and copyrights.
72
  */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++)
73
--- mt-static/css/main.css.orig	2013-12-02 02:40:33.000000000 +0900
74
+++ mt-static/css/main.css	2014-04-16 15:19:43.000000000 +0900
75
@@ -1,4 +1,4 @@
76
-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
77
+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
78
  * This file is combined from multiple sources.  Consult the source files for their
79
  * respective licenses and copyrights.
80
  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,
81
--- mt-static/css/simple.css.orig	2013-12-02 02:40:34.000000000 +0900
82
+++ mt-static/css/simple.css	2014-04-16 15:20:06.000000000 +0900
83
@@ -1,4 +1,4 @@
84
-/* Movable Type (r) Open Source (C) 2001-2013 Six Apart, Ltd.
85
+/* Movable Type (r) Open Source (C) 2001-2014 Six Apart, Ltd.
86
  * This file is combined from multiple sources.  Consult the source files for their
87
  * respective licenses and copyrights.
88
  */html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}body{margin:0;}h1,
89
--- php/mt.php.orig	2013-12-02 02:40:30.000000000 +0900
90
+++ php/mt.php	2014-04-16 15:21:49.000000000 +0900
91
@@ -11,16 +11,16 @@
92
 require_once('lib/class.exception.php');
93
94
 define('VERSION', '5.2');
95
-define('PRODUCT_VERSION', '5.2.9');
96
+define('PRODUCT_VERSION', '5.2.10');
97
98
 $PRODUCT_NAME = 'Movable Type';
99
 if($PRODUCT_NAME == '__PRODUCT' . '_NAME__')
100
     $PRODUCT_NAME = 'Movable Type';
101
 define('PRODUCT_NAME', $PRODUCT_NAME);
102
103
-$RELEASE_NUMBER = '9';
104
+$RELEASE_NUMBER = '10';
105
 if ( $RELEASE_NUMBER == '__RELEASE_' . 'NUMBER__' )
106
-    $RELEASE_NUMBER = 9;
107
+    $RELEASE_NUMBER = 10;
108
 define('RELEASE_NUMBER', $RELEASE_NUMBER);
109
110
 $PRODUCT_VERSION_ID = '5.2.9-ru';
111
--- themes/classic_blog/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
112
+++ themes/classic_blog/templates/comment_response.mtml	2014-04-16 15:22:52.000000000 +0900
113
@@ -15,7 +15,7 @@
114
 <mt:Else name="comment_error">
115
     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
116
     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
117
-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
118
+    <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>
119
 </mt:If>
120
121
122
--- themes/classic_blog/theme.yaml.orig	2013-12-02 02:38:32.000000000 +0900
123
+++ themes/classic_blog/theme.yaml	2014-04-16 15:23:26.000000000 +0900
124
@@ -2,7 +2,7 @@
125
 id: classic_blog
126
 author_name: Six Apart, Ltd.
127
 author_link: http://www.movabletype.org/
128
-version: 1.11
129
+version: 1.12
130
 class: blog
131
 protected: 1
132
 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.">
133
--- themes/pico/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
134
+++ themes/pico/templates/comment_response.mtml	2014-04-16 15:26:22.000000000 +0900
135
@@ -16,7 +16,8 @@
136
 <mt:Else name="comment_error">
137
     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
138
     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
139
-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
140
+    <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>
141
+ </mt:If>
142
 </mt:If>
143
144
145
--- themes/pico/theme.yaml.orig	2013-12-02 02:38:33.000000000 +0900
146
+++ themes/pico/theme.yaml	2014-04-16 15:26:41.000000000 +0900
147
@@ -2,7 +2,7 @@
148
 id: pico
149
 author_name: Six Apart, Ltd.
150
 author_link: http://www.movabletype.org/
151
-version: 1.11
152
+version: 1.12
153
 class: blog
154
 protected: 1
155
 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.">
156
--- themes/rainier/templates/comment_response.mtml.orig	2013-12-02 02:38:33.000000000 +0900
157
+++ themes/rainier/templates/comment_response.mtml	2014-04-16 15:27:29.000000000 +0900
158
@@ -6,7 +6,7 @@
159
   <$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>"$>
160
 <mt:Else name="comment_error">
161
   <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
162
-  <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>
163
+  <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>
164
 </mt:If>
165
 <!DOCTYPE html>
166
 <html>
167
--- themes/rainier/theme.yaml.orig	2013-12-02 02:38:33.000000000 +0900
168
+++ themes/rainier/theme.yaml	2014-04-16 15:27:46.000000000 +0900
169
@@ -1,6 +1,6 @@
170
 label: 'Rainier'
171
 id: 'rainier'
172
-version: 1.03
173
+version: 1.04
174
 author_link: 'http://www.sixapart.com/'
175
 author_name: 'Six Apart, Ltd.'
176
 class: 'blog'
177
--- themes/classic_website/templates/comment_response.mtml.orig	2013-12-02 02:38:32.000000000 +0900
178
+++ themes/classic_website/templates/comment_response.mtml	2014-04-16 15:25:24.000000000 +0900
179
@@ -15,7 +15,7 @@
180
 <mt:Else name="comment_error">
181
     <mt:Ignore><!-- Error message when comment submission fails --></mt:Ignore>
182
     <$mt:Var name="page_title" value="<__trans phrase="Comment Submission Error">"$>
183
-    <mt:SetVarBlock name="message"><p><__trans phrase="Your comment submission failed for the following reasons: [_1]" params="<$mt:ErrorMessage$>"></p></mt:SetVarBlock>
184
+    <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>
185
 </mt:If>
186
187
188
--- themes/classic_website/theme.yaml.orig	2013-12-02 02:38:32.000000000 +0900
189
+++ themes/classic_website/theme.yaml	2014-04-16 15:25:48.000000000 +0900
190
@@ -2,7 +2,7 @@
191
 id: classic_website
192
 author_name: Six Apart, Ltd.
193
 author_link: http://www.movabletype.org/
194
-version: 1.11
195
+version: 1.12
196
 class: website
197
 protected: 1
198
 description: <__trans phrase="Create a blog portal that aggregates contents from several blogs in one website.">

Return to bug 188684