diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-15 14:19:54 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-02-15 14:19:54 +0100 |
| commit | 70cf5ae3c79ad1b94e9d5fab82325d55a12761c0 (patch) | |
| tree | 5aeffd36453e9b890442a682623c84aee276836e /boot.php | |
| parent | dd8bbe820294ce6e0ca2e17f8783cb125b9871db (diff) | |
| parent | 473786d3a09a2210b2fe55a00d2bac5d8d207d52 (diff) | |
| download | volse-hubzilla-70cf5ae3c79ad1b94e9d5fab82325d55a12761c0.tar.gz volse-hubzilla-70cf5ae3c79ad1b94e9d5fab82325d55a12761c0.tar.bz2 volse-hubzilla-70cf5ae3c79ad1b94e9d5fab82325d55a12761c0.zip | |
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 13 |
1 files changed, 8 insertions, 5 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=":-(" />', @@ -2100,7 +2103,7 @@ function profile_sidebar($profile) { $tabs = ''; - $photo = '<div id="profile=photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>'; + $photo = '<div id="profile-photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>'; $connect = (($profile['uid'] != local_user()) ? '<li><a id="dfrn-request-link" href="dfrn_request/' . $profile['nickname'] . '">' . t('Connect') . '</a></li>' : ''); |