Merge branch '2019.06-rc'

[friendica-addons.git] / widgets / widget_like.php

diff --git a/widgets/widget_like.php b/widgets/widget_like.php
index 279311874defd64e8b70cb1fb05e6fb78f024ce8..1fcc96b997116f9e6c70f80216e4c9ddd789f74b 100644 (file)
--- a/widgets/widget_like.php
+++ b/widgets/widget_like.php
@@ -1,6 +1,8 @@
 <?php
 
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
 
 function like_widget_name() {
        return "Shows likes";
@@ -37,7 +39,7 @@ function like_widget_content(&$a, $conf){
        // count likes
        $r = q( $baseq . "AND `item`.`verb` = 'http://activitystrea.ms/schema/1.0/like'",
                        intval($conf['uid']),
-                       dbesc($args[0])
+                       DBA::escape($args[0])
        );
        $likes = $r[0]['c'];
        $iid = $r[0]['id'];
@@ -45,25 +47,21 @@ function like_widget_content(&$a, $conf){
        // count dislikes
        $r = q( $baseq . "AND `item`.`verb` = 'http://purl.org/macgirvin/dfrn/1.0/dislike'",
                        intval($conf['uid']),
-                       dbesc($args[0])
+                       DBA::escape($args[0])
        );
        $dislikes = $r[0]['c'];
 
 
-       require_once("include/conversation.php");
-
        $o = "";
 
 #      $t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
-       $t = get_markup_template("widget_like.tpl", "addon/widgets/");
-       $o .= replace_macros($t, [
+       $t = Renderer::getMarkupTemplate("widget_like.tpl", "addon/widgets/");
+       $o .= Renderer::replaceMacros($t, [
                '$like'         => $likes,
-               '$strlike'      => sprintf(L10n::tt("%d person likes this", "%d people like this", $likes), $likes),
+               '$strlike'      => L10n::tt("%d person likes this", "%d people like this", $likes),
 
                '$dislike'      => $dislikes,
-               '$strdislike'=> sprintf(L10n::tt("%d person doesn't like this", "%d people don't like this", $dislikes), $dislikes),
-
-               '$baseurl' => $a->get_baseurl(),
+               '$strdislike'=> L10n::tt("%d person doesn't like this", "%d people don't like this", $dislikes),
        ]);
 
        return $o;