Removed broken __END__ feature.

diff --git a/includes/Parser.php b/includes/Parser.php
index d6f0570..400ce4a 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3723,11 +3723,7 @@ class Parser
                }
 
                # Trim trailing whitespace
-               # __END__ tag allows for trailing
-               # whitespace to be deliberately included
                $text = rtrim( $text );
-               $mw =& MagicWord::get( 'end' );
-               $mw->matchAndRemove( $text );
 
                return $text;
        }

diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index b8e7864..74d3ead 100644 (file)
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -66,7 +66,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:'         ,          'رسالة:'          ),
        'subst'                  => array( 0,    'SUBST:'      ,     'نسخ:'  , 'نسخ_قالب:'   ),
        'msgnw'                  => array( 0,    'MSGNW:'     ,  'مصدر:' , 'مصدر_قالب:'      ),
-       'end'                    => array( 0,    '__END__'       ,  '__نهاية__', '__إنهاء__'   ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb'   ,          'تصغير'    ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1'  ,'تصغير=$1'      ),
        'img_right'              => array( 1,    'right'       ,       'يمين'                  ),

diff --git a/languages/messages/MessagesBe.php b/languages/messages/MessagesBe.php
index 0add41b..9ac6d41 100644 (file)
--- a/languages/messages/MessagesBe.php
+++ b/languages/messages/MessagesBe.php
@@ -81,7 +81,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:', 'ПАВЕДАМЛЕНЬНЕ:' ),
        'subst'                  => array( 0,    'SUBST:', 'ПАДСТАНОЎКА:' ),
        'msgnw'                  => array( 0,    'MSGNW:', 'ПАВЕДАМЛЕНЬНЕ_БЯЗЬ_ВІКІ:' ),
-       'end'                    => array( 0,    '__END__', '__КАНЕЦ__' ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb', 'значак', 'міні' ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1', 'значак=$1', 'міні=$1' ),
        'img_right'              => array( 1,    'right', 'справа' ),

diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index 65352f1..ad82bf7 100644 (file)
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -70,7 +70,6 @@ $magicWords = array(
        'namespace'              => array( 1, 'NAMESPACE', 'ИМЕННОПРОСТРАНСТВО'   ),
        'subst'                  => array( 0, 'SUBST:', 'ЗАМЕСТ:'            ),
        'msgnw'                  => array( 0, 'MSGNW:', 'СЪОБЩNW:'           ),
-       'end'                    => array( 0, '__END__', '__КРАЙ__'            ),
        'img_thumbnail'          => array( 1, 'thumbnail', 'thumb', 'мини'     ),
        'img_manualthumb'        => array( 1, 'thumbnail=$1', 'thumb=$1', 'мини=$1'),
        'img_right'              => array( 1, 'right', 'вдясно', 'дясно', 'д'  ),

diff --git a/languages/messages/MessagesBs.php b/languages/messages/MessagesBs.php
index c2bd729..94bcd9d 100644 (file)
--- a/languages/messages/MessagesBs.php
+++ b/languages/messages/MessagesBs.php
@@ -37,7 +37,6 @@ $magicWords = array(
        'toc'                    => array( 0, '__TOC__', '__SADRŽAJ__' ),
        'noeditsection'          => array( 0, '__NOEDITSECTION__', '__BEZ_IZMENA__', '__BEZIZMENA__' ),
        'start'                  => array( 0, '__START__', '__POČETAK__' ),
-       'end'                    => array( 0, '__END__', '__KRAJ__' ),
        'currentmonth'           => array( 1, 'CURRENTMONTH', 'TRENUTNIMJESEC' ),
        'currentmonthname'       => array( 1, 'CURRENTMONTHNAME', 'TRENUTNIMJESECIME' ),
        'currentmonthnamegen'    => array( 1, 'CURRENTMONTHNAMEGEN', 'TRENUTNIMJESECROD' ),

diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index bae3f65..2e466c5 100644 (file)
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -105,7 +105,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:'                   ),
        'subst'                  => array( 0,    'SUBST:',           'VLOŽIT:'            ),
        'msgnw'                  => array( 0,    'MSGNW:',           'VLOŽITNW:'          ),
-       'end'                    => array( 0,    '__END__',          '__KONEC__'          ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb', 'náhled'           ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1', 'náhled=$1'  ),
        'img_right'              => array( 1,    'right',            'vpravo'             ),

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1a3db85..75e8e81 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -279,7 +279,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:'                   ),
        'subst'                  => array( 0,    'SUBST:'                 ),
        'msgnw'                  => array( 0,    'MSGNW:'                 ),
-       'end'                    => array( 0,    '__END__'                ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb'     ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1'),
        'img_right'              => array( 1,    'right'                  ),

diff --git a/languages/messages/MessagesGa.php b/languages/messages/MessagesGa.php
index 6e0d273..25d2ed9 100644 (file)
--- a/languages/messages/MessagesGa.php
+++ b/languages/messages/MessagesGa.php
@@ -46,7 +46,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:',                 'TCHT:'  ),
        'subst'                  => array( 0,    'SUBST:',               'IONAD:'  ),
        'msgnw'                  => array( 0,    'MSGNW:',               'TCHTFS:'  ),
-       'end'                    => array( 0,    '__END__',              '__DEIREADH__'  ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb',   'mionsamhail', 'mion'  ),
        'img_right'              => array( 1,    'right',                'deas'  ),
        'img_left'               => array( 1,    'left',                 'clé'  ),

diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 9c0a594..9f9988c 100644 (file)
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -112,7 +112,6 @@ $magicWords = array(
        'msg'                   => array( 0,    'הכללה:',                                'MSG:'                   ),
        'subst'                 => array( 0,    'ס:',                                    'SUBST:'                 ),
        'msgnw'                 => array( 0,    'הכללת מקור',                            'MSGNW:'                 ),
-       'end'                   => array( 0,    '__סוף__',                               '__END__'                ),
        'img_thumbnail'         => array( 1,    'ממוזער',                                'thumbnail', 'thumb'     ),
        'img_manualthumb'       => array( 1,    'ממוזער=$1',                             'thumbnail=$1', 'thumb=$1'),
        'img_right'             => array( 1,    'ימין',                                  'right'                  ),

diff --git a/languages/messages/MessagesNds.php b/languages/messages/MessagesNds.php
index 88ac7be..56d7ab1 100644 (file)
--- a/languages/messages/MessagesNds.php
+++ b/languages/messages/MessagesNds.php
@@ -30,7 +30,6 @@ $magicWords = array(
        'namespace'              => array( 1, 'NAMESPACE',                   'NAAMRUUM'               ),
        'subst'                  => array( 0, 'SUBST:'                                                ),
        'msgnw'                  => array( 0, 'MSGNW:'                                                ),
-       'end'                    => array( 0, '__END__',                     '__ENN__'                ),
        'img_thumbnail'          => array( 1, 'thumbnail', 'thumb',          'duum'                   ),
        'img_right'              => array( 1, 'right',                       'rechts'                 ),
        'img_left'               => array( 1, 'left',                        'links'                  ),

diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index 6f0f3c5..c6ce863 100644 (file)
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -105,7 +105,6 @@ $magicWords = array(
        'namespace'              => array( 1,    'NAMESPACE', 'NAMNEROM', 'NAVNEROM'                                    ),
        'subst'                  => array( 0,    'SUBST:', 'LIMINN:'                                                    ),
        'msgnw'                  => array( 0,    'MSGNW:', 'IKWIKMELD:'                                                 ),
-       'end'                    => array( 0,    '__END__', '__SLUTT__'                                                 ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb', 'mini', 'miniatyr'                               ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1', 'mini=$1', 'miniatyr=$1'                   ),
        'img_right'              => array( 1,    'right', 'høgre', 'høyre'                                              ),

diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index 3981153..91a1768 100644 (file)
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -88,7 +88,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:'                   ),
        'subst'                  => array( 0,    'SUBST:'                 ),
        'msgnw'                  => array( 0,    'MSGNW:'                 ),
-       'end'                    => array( 0,    '__END__'                ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb'     ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1'),
        'img_right'              => array( 1,    'right', 'direita'       ),

diff --git a/languages/messages/MessagesRo.php b/languages/messages/MessagesRo.php
index a505ff0..3012eb0 100644 (file)
--- a/languages/messages/MessagesRo.php
+++ b/languages/messages/MessagesRo.php
@@ -29,7 +29,6 @@ $magicWords = array(
        'currentmonthnamegen'    => array( 1,    'CURRENTMONTHNAMEGEN', '{{NUMELUNACURENTAGEN}}'   ),
        'subst'                  => array( 0,    'SUBST:'                                          ),
        'msgnw'                  => array( 0,    'MSGNW:', 'MSJNOU:'                               ),
-       'end'                    => array( 0,    '__END__', '__FINAL__'                            ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb'                              ),
        'img_right'              => array( 1,    'right'                                           ),
        'img_left'               => array( 1,    'left'                                            ),

diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index ce9991c..9a0f414 100644 (file)
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -146,7 +146,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:', 'СООБЩ:'),
        'subst'                  => array( 0,    'SUBST:','ПОДСТ:'),
        'msgnw'                  => array( 0,    'MSGNW:', 'СООБЩ_БЕЗ_ВИКИ:'),
-       'end'                    => array( 0,    '__END__','__КОНЕЦ__'),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb', 'мини'),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1', 'мини=$1'),
        'img_right'              => array( 1,    'right','справа'),

diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index 2b158a7..9cb6f03 100644 (file)
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -100,7 +100,6 @@ $magicWords = array(
        'msg'   => array( 0, 'MSG:', 'SPRÁVA:' ),
        'subst'   => array( 0, 'SUBST:' ),
        'msgnw'   => array( 0, 'MSGNW:' ),
-       'end'   => array( 0, '__END__', '__KONIEC__' ),
        'img_thumbnail'   => array( 1, 'thumbnail', 'thumb', 'náhľad', 'náhľadobrázka' ),
        'img_right'   => array( 1, 'right', 'vpravo' ),
        'img_left'   => array( 1, 'left', 'vľavo' ),

diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index 76b38fd..6c2c0ec 100644 (file)
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -157,7 +157,6 @@ $magicWords = array(
        'toc'                    => array( 0, '__TOC__', '__САДРЖАЈ__' ),
        'noeditsection'          => array( 0, '__NOEDITSECTION__', '__БЕЗ_ИЗМЕНА__', '__БЕЗИЗМЕНА__' ),
        'start'                  => array( 0, '__START__', '__ПОЧЕТАК__' ),
-       'end'                    => array( 0, '__END__', '__КРАЈ__' ),
        'currentmonth'           => array( 1, 'CURRENTMONTH', 'ТРЕНУТНИМЕСЕЦ' ),
        'currentmonthname'       => array( 1, 'CURRENTMONTHNAME', 'ТРЕНУТНИМЕСЕЦИМЕ' ),
        'currentmonthnamegen'    => array( 1, 'CURRENTMONTHNAMEGEN', 'ТРЕНУТНИМЕСЕЦГЕН' ),

diff --git a/languages/messages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php
index 000b3ab..062b01a 100644 (file)
--- a/languages/messages/MessagesSr_el.php
+++ b/languages/messages/MessagesSr_el.php
@@ -159,7 +159,6 @@ $magicWords = array(
        'toc'                    => array( 0, '__TOC__', '__SADRŽAJ__' ),
        'noeditsection'          => array( 0, '__NOEDITSECTION__', '__BEZ_IZMENA__', '__BEZIZMENA__' ),
        'start'                  => array( 0, '__START__', '__POČETAK__' ),
-       'end'                    => array( 0, '__END__', '__KRAJ__' ),
        'currentmonth'           => array( 1, 'CURRENTMONTH', 'TRENUTNIMESEC' ),
        'currentmonthname'       => array( 1, 'CURRENTMONTHNAME', 'TRENUTNIMESECIME' ),
        'currentmonthnamegen'    => array( 1, 'CURRENTMONTHNAMEGEN', 'TRENUTNIMESECGEN' ),

diff --git a/languages/messages/MessagesTt.php b/languages/messages/MessagesTt.php
index 7f406b6..c43da89 100644 (file)
--- a/languages/messages/MessagesTt.php
+++ b/languages/messages/MessagesTt.php
@@ -66,7 +66,6 @@ $magicWords = array(
         'namespace'              => array( 1,    'İSEMARA',                'NAMESPACE'),
         'subst'                  => array( 0,    'TÖPÇEK:',                'SUBST:'),
         'msgnw'                  => array( 0,    'MSGNW:'                 ),
-        'end'                    => array( 0,    '__AZAQ__',               '__END__'),
         'img_thumbnail'          => array( 1,    'thumbnail', 'thumb'     ),
         'img_right'              => array( 1,    'uñda',                   'right'),
         'img_left'               => array( 1,    'sulda',                  'left'),

diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index eebadb3..049f507 100644 (file)
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -62,7 +62,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:'     , 'NHẮN:'              ),
        'subst'                  => array( 0,    'SUBST:'   ,  'THẾ:'            ),
        'msgnw'                  => array( 0,    'MSGNW:'    ,  'NHẮNMỚI:'             ),
-       'end'                    => array( 0,    '__END__'    , '__KẾT__'            ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb' , 'nhỏ'    ),
        'img_right'              => array( 1,    'right' , 'phải'                 ),
        'img_left'               => array( 1,    'left'  , 'trái'                ),

diff --git a/languages/messages/MessagesYi.php b/languages/messages/MessagesYi.php
index ee0c3d1..b079f5f 100644 (file)
--- a/languages/messages/MessagesYi.php
+++ b/languages/messages/MessagesYi.php
@@ -102,7 +102,6 @@ $magicWords = array(
        'msg'                    => array( 0,    'MSG:'                   ),
        'subst'                  => array( 0,    'SUBST:'                 ),
        'msgnw'                  => array( 0,    'MSGNW:'                 ),
-       'end'                    => array( 0,    '__END__'                ),
        'img_thumbnail'          => array( 1,    'thumbnail', 'thumb'     ),
        'img_manualthumb'        => array( 1,    'thumbnail=$1', 'thumb=$1'),
        'img_right'              => array( 1,    'right'                  ),