Merge branch 'g5'

2014-05-29 09:31:56 +09:00
parent e4509110fa a9ff55017b
commit aaeb725145
2 changed files with 3 additions and 2 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -2684,7 +2684,7 @@ function get_search_string($stx)
    $stx_pattern[] = '#\.*/+#';
    $stx_pattern[] = '#\\\*#';
    $stx_pattern[] = '#\.{2,}#';
-    $stx_pattern[] = '#[/\'\"%=*\#\(\)\|\+\-\&\!\$@~\{\}\[\]`;:\?]+#';
+    $stx_pattern[] = '#[/\'\"%=*\#\(\)\|\+\-\&\!\$@~\{\}\[\]`;:\?\^\,]+#';

    $stx_replace = array();
    $stx_replace[] = '';