diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-16 08:06:04 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-16 08:06:04 +0100 |
| commit | 9e746b504fd0f1367cce6353ac51f71327d8fb75 (patch) | |
| tree | a86bf9534cbb2ac6c497cf1874697350a387fd9e /boot.php | |
| parent | 53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1 (diff) | |
| parent | 97723ad69f71c716bd0e68eec95944b5469008ec (diff) | |
| download | volse-hubzilla-9e746b504fd0f1367cce6353ac51f71327d8fb75.tar.gz volse-hubzilla-9e746b504fd0f1367cce6353ac51f71327d8fb75.tar.bz2 volse-hubzilla-9e746b504fd0f1367cce6353ac51f71327d8fb75.zip | |
Merge branch 'master' of github.com:fabrixxm/friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -2,8 +2,8 @@ set_time_limit(0); -define ( 'BUILD_ID', 1038 ); -define ( 'FRIENDIKA_VERSION', '2.10.0906' ); +define ( 'BUILD_ID', 1039 ); +define ( 'FRIENDIKA_VERSION', '2.10.0907' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "<br />\r\n" ); @@ -1804,7 +1804,7 @@ function like_puller($a,$item,&$arr,$mode) { if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if(($item['network'] === 'dfrn') && (! $item['self']) && ($item['author-link'] == $item['url'])) { + if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { $url = $a->get_baseurl() . '/redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; } @@ -1978,8 +1978,11 @@ function smilies($s) { $a = get_app(); return str_replace( - array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), + array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), array( + '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', |