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

2013-08-07 11:46:49 +09:00
parent fe0158ac51 4feb6c8a36
commit de5f699959
28 changed files with 1041 additions and 256 deletions
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@ -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) {