From: Hypolite Petovan Date: Sat, 21 Jul 2018 01:59:17 +0000 (-0400) Subject: Rename DBA::clean_query to DBA::cleanQuery X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=abbaaf5aa5a581c6eb8f2a67377ea61b8ab0d821;p=friendica.git Rename DBA::clean_query to DBA::cleanQuery --- diff --git a/include/dba.php b/include/dba.php index 4b7fb8009e..32d3b1dde0 100644 --- a/include/dba.php +++ b/include/dba.php @@ -28,7 +28,7 @@ function q($sql) { return false; } - $sql = DBA::clean_query($sql); + $sql = DBA::cleanQuery($sql); $sql = DBA::anyValueFallback($sql); $stmt = @vsprintf($sql, $args); diff --git a/src/Database/DBA.php b/src/Database/DBA.php index 79c4422718..62283b3b36 100644 --- a/src/Database/DBA.php +++ b/src/Database/DBA.php @@ -306,7 +306,7 @@ class DBA * @param string $sql An SQL string without the values * @return string The input SQL string modified if necessary. */ - public static function clean_query($sql) { + public static function cleanQuery($sql) { $search = ["\t", "\n", "\r", " "]; $replace = [' ', ' ', ' ', ' ']; do { @@ -396,7 +396,7 @@ class DBA logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG); } - $sql = self::clean_query($sql); + $sql = self::cleanQuery($sql); $sql = self::anyValueFallback($sql); $orig_sql = $sql; diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index d0db9e572e..33e9c0d4d3 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -322,8 +322,8 @@ class DBStructure $parameters['comment'] = ""; } - $current_field_definition = DBA::clean_query(implode(",", $field_definition)); - $new_field_definition = DBA::clean_query(implode(",", $parameters)); + $current_field_definition = DBA::cleanQuery(implode(",", $field_definition)); + $new_field_definition = DBA::cleanQuery(implode(",", $parameters)); if ($current_field_definition != $new_field_definition) { $sql2 = self::modifyTableField($fieldname, $parameters); if ($sql3 == "") {