viewgit/inc/functions.php:22 Function utf8_encode() is deprecated [8192]

Add hyphen to the regex match for equiv terms when doing trending terms, remove chart bottom from hour table, a=chris

Chris Pollett [2020-06-22 02:Jun:nd]
Add hyphen to the regex match for equiv terms when doing trending terms, remove chart bottom from hour table, a=chris
Filename
src/css/search.css
src/library/media_jobs/FeedsUpdateJob.php
src/views/elements/TrendingElement.php
diff --git a/src/css/search.css b/src/css/search.css
index 159c4cf7d..3529649a3 100755
--- a/src/css/search.css
+++ b/src/css/search.css
@@ -3285,7 +3285,7 @@ p.start-ad
 {
     display:block;
     overflow-x: scroll;
-    max-width:300px;
+    max-width:320px;
 }
 .serp .trending
 {
@@ -3315,7 +3315,7 @@ h2.trending option
 .mobile .trending-float
 {
     float: none;
-    position: static;
+    position:static;
 }
 .trending-table
 {
diff --git a/src/library/media_jobs/FeedsUpdateJob.php b/src/library/media_jobs/FeedsUpdateJob.php
index f397ee683..2171d3511 100644
--- a/src/library/media_jobs/FeedsUpdateJob.php
+++ b/src/library/media_jobs/FeedsUpdateJob.php
@@ -890,7 +890,7 @@ class FeedsUpdateJob extends MediaJob
                 !in_array($term, $stop_words) &&
                 substr($term, 0, 4) != "http") {
                 $original_term = $term;
-                if (preg_match("/\b$term\w*\b/ui", $source_phrase,
+                if (preg_match("/\b$term".'[\w|\-]*\b/ui', $source_phrase,
                     $match)) {
                     $term = $match[0];
                     if (!empty($source_stop_regex) &&
@@ -905,16 +905,17 @@ class FeedsUpdateJob extends MediaJob
                     if (($pre_term = substr($term, -6)) == "\_pos\_s") {
                         $term = $pre_term . "\s*(\'|\&apos\;)\s+";
                     }
-                    if (preg_match("/\b$term\w*\b/ui", $source_phrase,
+                    if (preg_match("/\b$term".'[\w|\-]*\b/ui', $source_phrase,
                         $match)) {
                         $term = $match[0];
                     } else {
                         $trunc_term = mb_substr($term, 0, -1);
                         $trunc_original = mb_substr($original_term, 0, -1);
-                        if (preg_match("/\b$trunc_term\w*\b/ui",
+                        if (preg_match("/\b$trunc_term".'[\w|\-]*\b/ui',
                             $source_phrase, $match)) {
                             $term = $match[0];
-                        } else if (preg_match("/\b$trunc_original\w*\b/ui",
+                        } else if (preg_match(
+                            "/\b$trunc_original".'[\w|\-]*\b/ui',
                             $source_phrase, $match)) {
                             $term = $match[0];
                         } else {
diff --git a/src/views/elements/TrendingElement.php b/src/views/elements/TrendingElement.php
index e64c207b0..7fe83b1d4 100644
--- a/src/views/elements/TrendingElement.php
+++ b/src/views/elements/TrendingElement.php
@@ -106,8 +106,11 @@ class TrendingElement extends Element
                     <input type="hidden" name="q" value="<?=$base_chart_query .
                         $query_dates[$period] ?>" />
                     <p><b><?=$date_map[$period]?></b>
-                    <button class="right" type="submit"><?=
-                    tl('trending_element_chart')?></button></p>
+                    <?php
+                    if ($period !== C\ONE_HOUR) {?>
+                        <button class="right" type="submit"><?=
+                        tl('trending_element_chart')?></button></p><?php
+                    }?>
                     <table class="trending-table">
                         <tr class="trending-tr">
                         <th class="trending-th"><?=
ViewGit