Merge pull request #1703 from rabuzarus/readable_bytes

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index c97eb6e4af22dfc3061ded1606410abce307ceb6..a6ea4da810f634a03edd860cf7cb40d57fd57f3c 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -203,12 +203,11 @@ function localize_item(&$item){
 
                // we can't have a translation string with three positions but no distinguishable text
                // So here is the translate string.
-
                $txt = t('%1$s poked %2$s');
-
+               
                // now translate the verb
-
-               $txt = str_replace( t('poked'), t($verb), $txt);
+               $poked_t = trim(sprintf($txt, "",""));
+               $txt = str_replace( $poked_t, t($verb), $txt);
 
                // then do the sprintf on the translation string
 
@@ -909,7 +908,7 @@ function like_puller($a,$item,&$arr,$mode) {
 
        if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
                $url = $item['author-link'];
-               if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
+               if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
                        $url = $a->get_baseurl(true) . '/redir/' . $item['contact-id'];
                        $sparkle = ' class="sparkle" ';
                }