From: <var...@us...> - 2014-06-23 13:16:39
|
Revision: 8930 http://sourceforge.net/p/phpwiki/code/8930 Author: vargenau Date: 2014-06-23 13:16:31 +0000 (Mon, 23 Jun 2014) Log Message: ----------- _sql_quote --> sql_quote Modified Paths: -------------- trunk/lib/TextSearchQuery.php trunk/lib/WikiDB/backend/ADODB_oci8po.php trunk/lib/WikiDB/backend/PearDB_oci8.php trunk/lib/WikiDB/backend.php Modified: trunk/lib/TextSearchQuery.php =================================================================== --- trunk/lib/TextSearchQuery.php 2014-06-23 10:10:40 UTC (rev 8929) +++ trunk/lib/TextSearchQuery.php 2014-06-23 13:16:31 UTC (rev 8930) @@ -260,7 +260,7 @@ function sql() { - return '%' . $this->_sql_quote($this->word) . '%'; + return '%' . $this->sql_quote($this->word) . '%'; } /** @@ -634,7 +634,7 @@ return $this->word; } - protected function sql_quote() + function sql_quote() { global $request; $word = preg_replace('/(?=[%_\\\\])/', "\\", $this->word); Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2014-06-23 10:10:40 UTC (rev 8929) +++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2014-06-23 13:16:31 UTC (rev 8930) @@ -166,7 +166,7 @@ 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"); Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_oci8.php 2014-06-23 10:10:40 UTC (rev 8929) +++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2014-06-23 13:16:31 UTC (rev 8930) @@ -118,7 +118,7 @@ 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"); Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2014-06-23 10:10:40 UTC (rev 8929) +++ trunk/lib/WikiDB/backend.php 2014-06-23 13:16:31 UTC (rev 8930) @@ -864,7 +864,7 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |