fix angle char storage and transmission, rev update

diff --git a/boot.php b/boot.php
index f7d38c2551ece07077ccd21ad89ffa5f3f25b051..25f89abf49cb6b2c2bcb3e2687c61f9919e80eea 100644 (file)
--- 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',      1154      );
 

diff --git a/include/items.php b/include/items.php
index 701a7ada7ec3579596d5ffa525d8d14831c6b4ee..40b2c14b45ae71fe6ba60d0234acb4dddce6e05e 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -533,7 +533,7 @@ function get_atom_elements($feed,$item) {
                $res['body'] = $rawenv[0]['data'];
                $res['body'] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$res['body']);
                // make sure nobody is trying to sneak some html tags by us
-               $res['body'] = notags(base64url_decode($res['body']));
+               $res['body'] = htmlspecialchars(base64url_decode($res['body']),ENT_QUOTES,'UTF-8');
        }
 
        
@@ -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<entry>\r\n";
 
        if(is_array($author))

diff --git a/include/network.php b/include/network.php
index 0fff5c7cc9eea0993682da0810cc2748b4819e11..0e1a63792f5a04676cf3f23b00123c5cd7aad12b 100644 (file)
--- 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 fddc3fd124aa3dd49acd989ad82889b9ba9b771c..436adec50acac647bfd75ba9672d78d4caa31927 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -438,6 +438,7 @@ function item_post(&$a) {
 
        $body = bb_translate_video($body);
 
+
        /**
         * Fold multi-line [code] sequences
         */
@@ -446,6 +447,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 86bf30b5089a471c1a396c1207a046d0a2085aab..e9affd4dc9e43642f0a1915f8340a3896c2017d3 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"