Merge pull request #13 from touri/master

#2337 の修正
balibali · Sep 15, 2011 · d9b1b21 · d9b1b21
2 parents 223573f + 6a06c0b
commit d9b1b21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/model/doctrine/PluginDiaryCommentTable.class.php b/lib/model/doctrine/PluginDiaryCommentTable.class.php
@@ -69,7 +69,14 @@ protected function addSearchKeywordQuery(Doctrine_Query $q, $keywords)
   {
     foreach ($keywords as $keyword)
     {
-      $q->andWhere('body LIKE ?', array('%'.$keyword.'%'));
+      if (method_exists($q, 'andWhereLike'))
+      {
+        $q->andWhereLike('body', array($keyword));
+      }
+      else
+      {
+        $q->andWhere('body LIKE ?', array('%'.$keyword.'%'));
+      }
     }
   }
 }
diff --git a/lib/model/doctrine/PluginDiaryTable.class.php b/lib/model/doctrine/PluginDiaryTable.class.php
@@ -289,6 +289,11 @@ protected function addSearchKeywordQuery(Doctrine_Query $q, $keywords)
   {
     foreach ($keywords as $keyword)
     {
+      if (method_exists($q, 'escapePattern'))
+      {
+        $keyword = $q->escapePattern($keyword);
+      }
+
       $q->andWhere('title LIKE ? OR body LIKE ?', array('%'.$keyword.'%', '%'.$keyword.'%'));
     }
   }