fix angle char storage and transmission, rev update
This commit is contained in:
parent
864b5fc256
commit
621e737826
2
boot.php
2
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 );
|
||||
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue