firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source
This commit is contained in:
gnuboard
2013-08-07 11:46:49 +09:00
parent fe0158ac51 4feb6c8a36
commit de5f699959
28 changed files with 1041 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/common.lib.php
View File

@ -570,6 +570,7 @@ function html_purifier($html)
$config->set('HTML.SafeObject', true);
$config->set('HTML.SafeIframe', true);
$config->set('URI.SafeIframeRegexp','%^(https?:)?//('.$safeiframe.')%');
$config->set('Attr.AllowedFrameTargets', array('_blank'));
$purifier = new HTMLPurifier($config);
return $purifier->purify($html);
}

2
lib/shop.lib.php
View File

@ -281,7 +281,7 @@ class item_list
if ($this->ca_id3) {
$where_ca_id[] = " ca_id3 like '{$this->ca_id3}%' ";
}
$where[] = implode(" or ", $where_ca_id);
$where[] = "( ".implode(" or ", $where_ca_id)." )";
}
if ($this->order_by) {