diff options
| author | zottel <github@zottel.net> | 2012-05-31 08:43:14 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-31 08:43:14 +0200 |
| commit | 20fdbda25e7fa1c1f6e234867df495be1085f3f8 (patch) | |
| tree | 6eb8a4448647f17357d5c5219ddc577f4948230d /include | |
| parent | 24b58af68938558baa2ddc6809401ec528ff1176 (diff) | |
| parent | f0cf0ebb485432b444b1d85843385ebfda0260fd (diff) | |
| download | volse-hubzilla-20fdbda25e7fa1c1f6e234867df495be1085f3f8.tar.gz volse-hubzilla-20fdbda25e7fa1c1f6e234867df495be1085f3f8.tar.bz2 volse-hubzilla-20fdbda25e7fa1c1f6e234867df495be1085f3f8.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 8 | ||||
| -rw-r--r-- | include/text.php | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index c6d852fe7..0ed16217f 100644 --- a/include/items.php +++ b/include/items.php @@ -180,6 +180,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) foreach($items as $item) { + // prevent private email from leaking. + if($item['network'] === NETWORK_MAIL) + continue; + // public feeds get html, our own nodes use bbcode if($public_feed) { @@ -2933,8 +2937,8 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) { logger('fix_private_photos', LOGGER_DEBUG); $site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')); - if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) { - $image = $matches[1]; + if(preg_match("/\[img(.*?)\](.*?)\[\/img\]/is",$s,$matches)) { + $image = $matches[2]; logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG); if(stristr($image , $site . '/photo/')) { $replace = false; diff --git a/include/text.php b/include/text.php index d6a9ef5d3..376ac473d 100644 --- a/include/text.php +++ b/include/text.php @@ -742,6 +742,8 @@ function smilies($s, $sample = false) { ':homebrew', ':coffee', ':facepalm', + ':like', + ':dislike', '~friendika', '~friendica' @@ -778,6 +780,8 @@ function smilies($s, $sample = false) { '<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />', '<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />', '<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />', + '<img src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />', + '<img src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />', '<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>', '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>' ); |