Change escapeString function to static (in SphinxSearch class)

This commit is contained in:
DariusIII
2018-02-07 15:44:11 +01:00
parent f7e229a2e4
commit 16e20e63bd
2 changed files with 6 additions and 5 deletions
+1
View File
@@ -1,4 +1,5 @@
2018-02-07 DariusIII
* Chg: Change escapeString function to static (in SphinxSearch class)
* Chg: Do not use delete_release stored procedure anymore to delete releases, FK's do it
* Chg: Remove yydecode setting check from yenc, will be dropped at later date
2018-02-06 DariusIII
+5 -5
View File
@@ -51,10 +51,10 @@ class SphinxSearch
sprintf(
'REPLACE INTO releases_rt (id, name, searchname, fromname, filename) VALUES (%d, %s, %s, %s, %s)',
$parameters['id'],
$this->escapeString($parameters['name']),
$this->escapeString($parameters['searchname']),
$this->escapeString($parameters['fromname']),
empty($parameters['filename']) ? "''" : $this->escapeString($parameters['filename'])
self::escapeString($parameters['name']),
self::escapeString($parameters['searchname']),
self::escapeString($parameters['fromname']),
empty($parameters['filename']) ? "''" : self::escapeString($parameters['filename'])
)
);
}
@@ -89,7 +89,7 @@ class SphinxSearch
*
* @return string Escaped string.
*/
public function escapeString($string): string
public static function escapeString($string): string
{
$from = ['\\', '(', ')', '|', '-', '!', '@', '~', '"', '&', '/', '^', '$', '='];
$to = ['\\\\', '\(', '\)', '\|', '\-', '\!', '\@', '\~', '\"', '\&', '\/', '\^', '\$', '\='];