Merge branch 'master' into feature/introduce-tests

.gitignore

@@ -1,21 +1,3 @@
-system/pear/*.php
-system/pear/Archive
-system/pear/Auth
-system/pear/Console
-system/pear/Date
-system/pear/HTTP
-system/pear/Mail
-system/pear/Net
-system/pear/OS
-system/pear/PEAR
-system/pear/PHP
-system/pear/System.php
-system/pear/Text
-system/pear/XML
-system/pear/scripts
-system/pear/LICENSE
-
-
 public_html/.htaccess
 public_html/web.config
 aspnet_client/
@@ -24,7 +6,6 @@ db-config.php
 public_html/siteconfig.php
 system/lib-custom.php
 
-public_html/.htaccess
 public_html/sitemap.xml
 public_html/filemanager/scripts/filemanager.config.js
 

language/english.php

@@ -2122,6 +2122,7 @@
     'advanced_editor' => "Advanced Editor?",
     'advanced_editor_name' => "Advanced Editor Name?",
     'wikitext_editor' => "Wikitext Editor?",
+    'remove_4byte_chars' => 'Remove 4-byte utf-8 characters?',
     'cron_schedule_interval' => "Cron Schedule Interval",
     'sortmethod' => "Sort Topics",
     'showstorycount' => "Show Story Count?",

language/english_utf-8.php

@@ -2121,6 +2121,7 @@
     'advanced_editor' => "Advanced Editor?",
     'advanced_editor_name' => "Advanced Editor Name?",
     'wikitext_editor' => "Wikitext Editor?",
+    'remove_4byte_chars' => 'Remove 4-byte utf-8 characters?',
     'cron_schedule_interval' => "Cron Schedule Interval",
     'sortmethod' => "Sort Topics",
     'showstorycount' => "Show Story Count?",

language/japanese_utf-8.php

@@ -2126,6 +2126,7 @@
     'advanced_editor' => 'アドバンストエディターを使用する',
     'advanced_editor_name' => 'アドバンストエディター名',
     'wikitext_editor' => 'Wikiテキストエディターを使用する',
+    'remove_4byte_chars' => '4バイトのutf-8文字を除去する',
     'cron_schedule_interval' => 'Cronのスケジュール間隔',
     'sortmethod' => '話題の並べ替え',
     'showstorycount' => '記事数を表示する',

plugins/calendar/functions.inc

@@ -419,7 +419,7 @@ function plugin_savesubmission_calendar($A)
     $retval = '';
 
     $A['title'] = strip_tags(COM_checkWords($A['title']));
-    $A['title'] = GLText::removeUtf8Icons($A['title']);
+    $A['title'] = GLText::remove4byteUtf8Chars($A['title']);
     $A['start_year'] = COM_applyFilter($A['start_year'], true);
     $A['start_month'] = COM_applyFilter($A['start_month'], true);
     $A['start_day'] = COM_applyFilter($A['start_day'], true);
@@ -506,15 +506,15 @@ function plugin_savesubmission_calendar($A)
 
     // Remove any autotags the user doesn't have permission to use
     $A['description'] = PLG_replaceTags($A['description'], '', true);
-    $A['description'] = DB_escapeString(htmlspecialchars(GLText::removeUtf8Icons(COM_checkWords($A['description']))));
-    $A['address1'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['address1']))));
-    $A['address2'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['address2']))));
-    $A['city'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['city']))));
-    $A['zipcode'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['zipcode']))));
-    $A['state'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['state']))));
-    $A['location'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['location']))));
-    $A['event_type'] = DB_escapeString(GLText::removeUtf8Icons(strip_tags(COM_checkWords($A['event_type']))));
-    $A['title'] = DB_escapeString(GLText::removeUtf8Icons($A['title']));
+    $A['description'] = DB_escapeString(htmlspecialchars(GLText::remove4byteUtf8Chars(COM_checkWords($A['description']))));
+    $A['address1'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['address1']))));
+    $A['address2'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['address2']))));
+    $A['city'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['city']))));
+    $A['zipcode'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['zipcode']))));
+    $A['state'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['state']))));
+    $A['location'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['location']))));
+    $A['event_type'] = DB_escapeString(GLText::remove4byteUtf8Chars(strip_tags(COM_checkWords($A['event_type']))));
+    $A['title'] = DB_escapeString(GLText::remove4byteUtf8Chars($A['title']));
 
     $A['url'] = DB_escapeString(COM_sanitizeUrl($A['url']));