diff options
| author | Derky <derky@phpbb.com> | 2018-01-04 21:20:46 +0100 |
|---|---|---|
| committer | Derky <derky@phpbb.com> | 2018-01-04 21:20:46 +0100 |
| commit | 2fcb8ab87fb30c57b106695859c2661fc3cc2837 (patch) | |
| tree | 4e2a1437ff2cc9b3ca742716047660bf0367c824 /phpBB/phpbb/db/extractor | |
| parent | 0ff5f9fa0edf9ac3125cc4e871609a90cee1cfac (diff) | |
| parent | c1ec6517bfe0f080ad052e727073794583464bfb (diff) | |
| download | forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar.gz forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar.bz2 forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar.xz forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.zip | |
Merge pull request #5069 from marc1706/ticket/14972-rhea
[ticket/14972] Backport for PHP 7.2 compatibility
Diffstat (limited to 'phpBB/phpbb/db/extractor')
| -rw-r--r-- | phpBB/phpbb/db/extractor/mssql_extractor.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/db/extractor/oracle_extractor.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/db/extractor/mssql_extractor.php b/phpBB/phpbb/db/extractor/mssql_extractor.php index 2817d3ebcc..4eeab4780e 100644 --- a/phpBB/phpbb/db/extractor/mssql_extractor.php +++ b/phpBB/phpbb/db/extractor/mssql_extractor.php @@ -132,14 +132,14 @@ class mssql_extractor extends base_extractor $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - if (!sizeof($rows)) + if (!count($rows)) { $sql_data .= "ALTER TABLE [$table_name] WITH NOCHECK ADD\n"; $sql_data .= "\tCONSTRAINT [{$row['CONSTRAINT_NAME']}] PRIMARY KEY CLUSTERED \n\t(\n"; } $rows[] = "\t\t[{$row['COLUMN_NAME']}]"; } - if (sizeof($rows)) + if (count($rows)) { $sql_data .= implode(",\n", $rows); $sql_data .= "\n\t) ON [PRIMARY] \nGO\n"; diff --git a/phpBB/phpbb/db/extractor/oracle_extractor.php b/phpBB/phpbb/db/extractor/oracle_extractor.php index 79a991889b..bc43a37b10 100644 --- a/phpBB/phpbb/db/extractor/oracle_extractor.php +++ b/phpBB/phpbb/db/extractor/oracle_extractor.php @@ -82,7 +82,7 @@ class oracle_extractor extends base_extractor } $this->db->sql_freeresult($result); - if (sizeof($primary_key)) + if (count($primary_key)) { $rows[] = " CONSTRAINT {$constraint_name} PRIMARY KEY (" . implode(', ', $primary_key) . ')'; } @@ -103,7 +103,7 @@ class oracle_extractor extends base_extractor } $this->db->sql_freeresult($result); - if (sizeof($unique)) + if (count($unique)) { $rows[] = " CONSTRAINT {$constraint_name} UNIQUE (" . implode(', ', $unique) . ')'; } |