From a4055c4a74b894afca54dcc337e9f8d5388d52d2 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 6 Nov 2018 17:36:03 +0100 Subject: [PATCH] Change comments to use same tickets ref syntax --- application/utils.inc.php | 5 +++-- application/wizardhelper.class.inc.php | 2 +- core/cmdbsource.class.inc.php | 10 +++++----- core/config.class.inc.php | 8 ++++---- core/csvbulkexport.class.inc.php | 4 ++-- core/dbobject.class.php | 3 ++- setup/backup.class.inc.php | 2 +- setup/runtimeenv.class.inc.php | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 939224137..d648614a4 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -1,6 +1,7 @@ Set($sAttCode, $value); } } diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php index e08f70660..1efcb9ffa 100644 --- a/core/cmdbsource.class.inc.php +++ b/core/cmdbsource.class.inc.php @@ -114,12 +114,12 @@ class CMDBSource protected static $m_sDBName; /** * @var boolean - * @since 2.5 #1260 MySQL TLS first implementation + * @since 2.5 N°1260 MySQL TLS first implementation */ protected static $m_bDBTlsEnabled; /** * @var string - * @since 2.5 #1260 MySQL TLS first implementation + * @since 2.5 N°1260 MySQL TLS first implementation */ protected static $m_sDBTlsCA; @@ -133,7 +133,7 @@ class CMDBSource * use expression as value) * * @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html - * @since 2.5 #1001 switch to utf8mb4 + * @since 2.5 N°1001 switch to utf8mb4 */ public static function GetSqlStringColumnDefinition() { @@ -1042,7 +1042,7 @@ class CMDBSource * @return string query to upgrade table charset and collation if needed, null if not * @throws \MySQLException * - * @since 2.5 #1001 switch to utf8mb4 + * @since 2.5 N°1001 switch to utf8mb4 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-table.html */ public static function DBCheckTableCharsetAndCollation($sTableName) @@ -1192,7 +1192,7 @@ class CMDBSource * @return string query to upgrade database charset and collation if needed, null if not * @throws \MySQLException * - * @since 2.5 #1001 switch to utf8mb4 + * @since 2.5 N°1001 switch to utf8mb4 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html */ public static function DBCheckCharsetAndCollation() diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 154a67446..8649de9c7 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -167,7 +167,7 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ), - 'db_character_set' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch + 'db_character_set' => array( // @deprecated to remove in 2.7 ? N°1001 utf8mb4 switch 'type' => 'string', 'description' => 'Deprecated since iTop 2.5 : now using utf8mb4', 'default' => 'DEPRECATED_2.5', @@ -175,7 +175,7 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ), - 'db_collation' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch + 'db_collation' => array( // @deprecated to remove in 2.7 ? N°1001 utf8mb4 switch 'type' => 'string', 'description' => 'Deprecated since iTop 2.5 : now using utf8mb4_unicode_ci', 'default' => 'DEPRECATED_2.5', @@ -1560,7 +1560,7 @@ class Config /** * @return string * - * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch + * @deprecated 2.5 will be removed in 2.6 N°1001 utf8mb4 switch * @see Config::DEFAULT_CHARACTER_SET */ public function GetDBCharacterSet() @@ -1571,7 +1571,7 @@ class Config /** * @return string * - * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch + * @deprecated 2.5 will be removed in 2.6 N°1001 utf8mb4 switch * @see Config::DEFAULT_COLLATION */ public function GetDBCollation() diff --git a/core/csvbulkexport.class.inc.php b/core/csvbulkexport.class.inc.php index a51f80e36..bfb22cfcf 100644 --- a/core/csvbulkexport.class.inc.php +++ b/core/csvbulkexport.class.inc.php @@ -266,7 +266,7 @@ EOF if ($this->aStatusInfo['charset'] != 'UTF-8') { // Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string - // and thus to convert field by field and not the whole row or file at once (see ticket #991) + // and thus to convert field by field and not the whole row or file at once (see ticket N°991) $aData[$idx] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $aData[$idx]); } } @@ -325,7 +325,7 @@ EOF if ($this->aStatusInfo['charset'] != 'UTF-8') { // Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string - // and thus to convert field by field and not the whole row or file at once (see ticket #991) + // and thus to convert field by field and not the whole row or file at once (see ticket N°991) $aData[] = @iconv('UTF-8', $this->aStatusInfo['charset'].'//IGNORE//TRANSLIT', $sField); } else diff --git a/core/dbobject.class.php b/core/dbobject.class.php index c583d4c40..d30415ce6 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -2488,7 +2488,8 @@ abstract class DBObject implements iDisplay $this->AfterDelete(); $this->m_bIsInDB = false; - // Fix for #926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete objects, reported as bug #926) + // Fix for N°926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete + // objects, reported as bug N°926) // Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected } } diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php index cb1816814..5f185282a 100644 --- a/setup/backup.class.inc.php +++ b/setup/backup.class.inc.php @@ -180,7 +180,7 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the " /** * utf8mb4 was added in MySQL 5.5.3 but works with programs like mysqldump only since MySQL 5.5.33 * - * @since 2.5 see #1001 + * @since 2.5 see N°1001 */ const MYSQL_VERSION_WITH_UTF8MB4_IN_PROGRAMS = '5.5.33'; diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index 7aeaa3e6c..8bf2f97bd 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -908,7 +908,7 @@ class RunTimeEnvironment * * @param string $sQuery * - * @since 2.5 #1001 utf8mb4 switch + * @since 2.5 N°1001 utf8mb4 switch * @uses \SetupUtils::GetSetupQueriesFilePath() */ protected function log_db_query($sQuery)