diff --git a/boot.php b/boot.php index 170c9953b9..ac1c7bc824 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1423' ); +define ( 'FRIENDICA_VERSION', '3.0.1424' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1155 ); diff --git a/include/items.php b/include/items.php index 701a7ada7e..3b09dfa688 100755 --- a/include/items.php +++ b/include/items.php @@ -578,6 +578,7 @@ function get_atom_elements($feed,$item) { $res['body'] = escape_tags($res['body']); } + // this tag is obsolete but we keep it for really old sites $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); @@ -3328,7 +3329,6 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { else $body = $item['body']; - $o = "\r\n\r\n\r\n"; if(is_array($author)) diff --git a/include/network.php b/include/network.php index 0fff5c7cc9..0e1a63792f 100644 --- a/include/network.php +++ b/include/network.php @@ -854,6 +854,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) } } } + + // replace the special char encoding + + $s = htmlspecialchars($s,ENT_QUOTES,'UTF-8'); return $s; } diff --git a/mod/item.php b/mod/item.php index d5c36ef76c..d82d54cfff 100644 --- a/mod/item.php +++ b/mod/item.php @@ -439,6 +439,7 @@ function item_post(&$a) { $body = bb_translate_video($body); + /** * Fold multi-line [code] sequences */ @@ -447,6 +448,8 @@ function item_post(&$a) { $body = scale_external_images($body,false); + + /** * Look for any tags and linkify them */ diff --git a/util/messages.po b/util/messages.po index 86bf30b508..e9affd4dc9 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1423\n" +"Project-Id-Version: 3.0.1424\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-02 10:00-0700\n" +"POT-Creation-Date: 2012-08-03 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"