Fix so staticpage likes are disabled when likes are disabled sitewide

Fix for #1029
Geeklog-Core · May 26, 2022 · fd6caf3 · fd6caf3
1 parent 0886cc7
commit fd6caf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/polls/functions.inc b/plugins/polls/functions.inc
@@ -653,7 +653,7 @@ function POLLS_pollVote($pid, $showall = true, $displaytype = 0, $order = '', $m
                 $poll->set_var('lang_polltopics', $LANG_POLLS['polltopics']);
                 $poll->set_var('poll_notification', $notification);
 
-				if ($_CONF['likes_enabled'] != 0 && $_PO_CONF['likes_polls'] != 0) {
+				if ($_CONF['likes_enabled'] && $_PO_CONF['likes_polls']) {
 					$poll->set_var('likes_control',LIKES_control(POLLS_PLUGIN_NAME, '', $pid, $_PO_CONF['likes_polls']));
 				} else {
 					$poll->set_var('likes_control', '');
@@ -990,7 +990,7 @@ function POLLS_pollResults($pid, $scale = 100, $order = '', $mode = '', $page =
                 }
             }
 
-			if ($_CONF['likes_enabled'] != 0 && $_PO_CONF['likes_polls'] != 0) {
+			if ($_CONF['likes_enabled'] && $_PO_CONF['likes_polls']) {
 				$poll->set_var('likes_control',LIKES_control(POLLS_PLUGIN_NAME, '', $pid, $_PO_CONF['likes_polls']));
 			} else {
 				$poll->set_var('likes_control', '');

diff --git a/plugins/staticpages/functions.inc b/plugins/staticpages/functions.inc
@@ -589,7 +589,7 @@ function SP_displayPage($page, $A, $comment_order = 'ASC', $comment_mode = 'nest
             $spage->set_var('edit_icon', $icon);
         }
 
-		if ($A['likes']) {
+		if ($_CONF['likes_enabled'] && $A['likes']) {
 			if ($A['likes'] == -1) {
 				// Set to use Plugin Likes default setting
 				$sp_likes = $_SP_CONF['likes_pages'];