[Fusionforge-commits] FusionForge branch master updated. 11efe13846207158fde37e41de475b762a36f962

Marc-Etienne VARGENAU vargenau at fusionforge.org
Mon Jun 23 15:25:07 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  11efe13846207158fde37e41de475b762a36f962 (commit)
      from  e9fd45cde6439099bc3a16669a757d986114eb94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11efe13846207158fde37e41de475b762a36f962
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Jun 23 15:24:39 2014 +0200

    wiki: _sql_quote --> sql_quote

diff --git a/src/plugins/wiki/www/lib/TextSearchQuery.php b/src/plugins/wiki/www/lib/TextSearchQuery.php
index 3d52946..c9c3ee8 100644
--- a/src/plugins/wiki/www/lib/TextSearchQuery.php
+++ b/src/plugins/wiki/www/lib/TextSearchQuery.php
@@ -260,7 +260,7 @@ class TextSearchQuery
 
     function sql()
     {
-        return '%' . $this->_sql_quote($this->word) . '%';
+        return '%' . $this->sql_quote($this->word) . '%';
     }
 
     /**
@@ -634,7 +634,7 @@ class TextSearchQuery_node
         return $this->word;
     }
 
-    protected function sql_quote()
+    function sql_quote()
     {
         global $request;
         $word = preg_replace('/(?=[%_\\\\])/', "\\", $this->word);
diff --git a/src/plugins/wiki/www/lib/WikiDB/backend.php b/src/plugins/wiki/www/lib/WikiDB/backend.php
index 4f19ee8..58c2225 100644
--- a/src/plugins/wiki/www/lib/WikiDB/backend.php
+++ b/src/plugins/wiki/www/lib/WikiDB/backend.php
@@ -864,7 +864,7 @@ class WikiDB_backend_search_sql extends WikiDB_backend_search
     function _fulltext_match_clause($node)
     {
         // force word-style %word% for fulltext search
-        $word = '%' . $node->_sql_quote($node->word) . '%';
+        $word = '%' . $node->sql_quote($node->word) . '%';
         // eliminate stoplist words
         if ($this->isStoplisted($node))
             return "1=1"; // and (pagename or 1) => and 1
diff --git a/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php b/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php
index 6ec96c1..ce6acdb 100644
--- a/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php
+++ b/src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php
@@ -166,7 +166,7 @@ class WikiDB_backend_ADODB_oci8_search
         if ($this->isStoplisted($node))
             return "1=1";
         $page = $node->sql();
-        $exactword = $node->_sql_quote($node->word);
+        $exactword = $node->sql_quote($node->word);
         return ($this->_case_exact
             ? "pagename LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0"
             : "LOWER(pagename) LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0");
diff --git a/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php b/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php
index 86607e8..4f4eba1 100644
--- a/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php
+++ b/src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php
@@ -118,7 +118,7 @@ class WikiDB_backend_PearDB_oci8_search
         if ($this->isStoplisted($node))
             return "1=1";
         $page = $node->sql();
-        $exactword = $node->_sql_quote($node->word);
+        $exactword = $node->sql_quote($node->word);
         return ($this->_case_exact
             ? "pagename LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0"
             : "LOWER(pagename) LIKE '$page' OR DBMS_LOB.INSTR(content, '$exactword') > 0");

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/wiki/www/lib/TextSearchQuery.php             |    4 ++--
 src/plugins/wiki/www/lib/WikiDB/backend.php              |    2 +-
 src/plugins/wiki/www/lib/WikiDB/backend/ADODB_oci8po.php |    2 +-
 src/plugins/wiki/www/lib/WikiDB/backend/PearDB_oci8.php  |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list