Skip to content

Commit 63c8d12

Browse files
committed
[plugin:gsearch] fix link url problem
URL に "%" が含まれるなどの場合に正しくリンクされない問題の修正。 ref. http://xoops.hypweb.net/modules/forum/index.php?post_id=13424
1 parent 7ea2aa8 commit 63c8d12

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: xoops_trust_path/modules/xpwiki/plugin/gsearch.inc.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ function plugin_gsearch_build_web($res,$target,$col)
217217
mb_convert_variables($this->cont['SOURCE_ENCODING'],"UTF-8",$dats);
218218
foreach ($dats as $dat)
219219
{
220-
if ($this->plugin_gsearch_check_ngsite($dat['url'])) {continue;}
220+
if ($this->plugin_gsearch_check_ngsite($dat['unescapedUrl'])) {continue;}
221221
if ($cnt++ % $limit === 0 && $cnt !== 1) $html .= "</ul></div>".$sdiv."<ul>";
222222
$html .= "<li>";
223-
$html .= "<a href='".$dat['url']."' target='{$target}'>".$dat['titleNoFormatting']."</a>";
223+
$html .= "<a href='".$this->func->htmlspecialchars($dat['unescapedUrl'])."' target='{$target}'>".$dat['titleNoFormatting']."</a>";
224224
$html .= "<div class='quotation'>".$this->func->make_link(strip_tags($dat['content']))."</div>";
225225
$html .= "</li>";
226226
}
@@ -250,7 +250,7 @@ function plugin_gsearch_build_images($res,$target,$col)
250250
mb_convert_variables($this->cont['SOURCE_ENCODING'],"UTF-8",$dats);
251251
foreach ($dats as $dat)
252252
{
253-
if ($this->plugin_gsearch_check_ngsite($dat['url'])) {continue;}
253+
if ($this->plugin_gsearch_check_ngsite($dat['unescapedUrl'])) {continue;}
254254
$title = "[".$dat['titleNoFormatting']."]".$this->func->htmlspecialchars($dat['contentNoFormatting']);
255255
$size = $dat['width']." x ".$dat['height'];
256256
$site = "[ <a href=\"".$this->func->htmlspecialchars($dat['originalContextUrl'])."\" target='{$target}'>Site</a> ]";
@@ -287,9 +287,9 @@ function plugin_gsearch_build_video($res,$target,$col)
287287
mb_convert_variables($this->cont['SOURCE_ENCODING'],"UTF-8",$dats);
288288
foreach ($dats as $dat)
289289
{
290-
if ($this->plugin_gsearch_check_ngsite($dat['url'])) {continue;}
290+
if ($this->plugin_gsearch_check_ngsite($dat['unescapedUrl'])) {continue;}
291291
$title = "[".$dat['titleNoFormatting']."]".$this->func->htmlspecialchars($dat['contentNoFormatting']);
292-
$site = " [ <a href=\"".$this->func->htmlspecialchars($dat['url'])."\" target='{$target}'>Site</a> ]";
292+
$site = " [ <a href=\"".$this->func->htmlspecialchars($dat['unescapedUrl'])."\" target='{$target}'>Site</a> ]";
293293
$min = (int)($dat['duration'] / 60);
294294
$sec = sprintf("%02d",($dat['duration'] % 60));
295295
$length = $min.":".$sec;

0 commit comments

Comments
 (0)