diff options
-rw-r--r-- | include/text.php | 2 | ||||
-rw-r--r-- | mod/photos.php | 14 | ||||
-rw-r--r-- | mod/siteinfo.php | 2 | ||||
-rwxr-xr-x | view/tpl/photo_view.tpl | 10 |
4 files changed, 14 insertions, 14 deletions
diff --git a/include/text.php b/include/text.php index 205736502..775076e93 100644 --- a/include/text.php +++ b/include/text.php @@ -2221,7 +2221,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d } if($tag == '#getzot') { $basetag = 'getzot'; - $url = 'https://redmatrix.me'; + $url = 'http://hubzilla.org'; $newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]'; $body = str_replace($tag,$newtag,$body); $replaced = true; diff --git a/mod/photos.php b/mod/photos.php index cd293b39d..887f663ca 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -982,13 +982,13 @@ function photos_content(&$a) { $likebuttons = ''; if($can_post || $can_comment) { - $likebuttons = replace_macros($like_tpl,array( - '$id' => $link_item['id'], - '$likethis' => t("I like this \x28toggle\x29"), - '$nolike' => t("I don't like this \x28toggle\x29"), - '$share' => t('Share'), - '$wait' => t('Please wait') - )); + $likebuttons = array( + 'id' => $link_item['id'], + 'likethis' => t("I like this \x28toggle\x29"), + 'nolike' => t("I don't like this \x28toggle\x29"), + 'share' => t('Share'), + 'wait' => t('Please wait') + ); } $comments = ''; diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 14aaef144..2fffccc73 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -165,7 +165,7 @@ function siteinfo_content(&$a) { '$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2], '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), - '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'), + '$visit' => t('Please visit <a href="http://hubzilla.org">hubzilla.org</a> to learn more about $Projectname.'), '$bug_text' => t('Bug reports and issues: please visit'), '$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues', '$bug_link_text' => t('$projectname issues'), diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 225b4f6b0..867a1e87b 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -133,14 +133,14 @@ {{/if}} {{if $likebuttons}} <div class="photo-item-tools-right btn-group pull-right"> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> - <i class="icon-thumbs-up-alt" title="{{$likethis}}"></i> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false"> + <i class="icon-thumbs-up-alt" title="{{$likebuttons.likethis}}"></i> </button> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false"> - <i class="icon-thumbs-down-alt" title="{{$nolike}}"></i> + <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false"> + <i class="icon-thumbs-down-alt" title="{{$likebuttons.nolike}}"></i> </button> </div> - <div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div> + <div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div> {{/if}} <div class="clear"></div> </div> |