clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

This commit is contained in:
Domovoy 2012-08-04 23:33:06 +02:00
parent 8742beb772 0c67649c08
commit 786e9064f2
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1423' ); define ( 'FRIENDICA_VERSION', '3.0.1424' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1155 ); define ( 'DB_UPDATE_VERSION', 1155 );

2
include/items.php
View File

@ -578,6 +578,7 @@ function get_atom_elements($feed,$item) {
$res['body'] = escape_tags($res['body']); $res['body'] = escape_tags($res['body']);
} }
// this tag is obsolete but we keep it for really old sites // this tag is obsolete but we keep it for really old sites
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); $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 else
$body = $item['body']; $body = $item['body'];
$o = "\r\n\r\n<entry>\r\n"; $o = "\r\n\r\n<entry>\r\n";
if(is_array($author)) if(is_array($author))

4
include/network.php
View File

@ -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; return $s;
} }

3
mod/item.php
View File

@ -439,6 +439,7 @@ function item_post(&$a) {
$body = bb_translate_video($body); $body = bb_translate_video($body);
/** /**
* Fold multi-line [code] sequences * Fold multi-line [code] sequences
*/ */
@ -447,6 +448,8 @@ function item_post(&$a) {
$body = scale_external_images($body,false); $body = scale_external_images($body,false);
/** /**
* Look for any tags and linkify them * Look for any tags and linkify them
*/ */

4
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1423\n" "Project-Id-Version: 3.0.1424\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"