diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 17:53:04 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-01-09 17:53:04 +0100 |
| commit | b2324607ad7d23450aafddbf6fb286fa05e3a9d5 (patch) | |
| tree | 44b6b7108c59e1e2da190424b0cd8395b3abba47 /phpBB/phpbb/db | |
| parent | 81cbabc1f6cebb4e93f9897c9e9e099fa9429ffe (diff) | |
| parent | 3f44f368172f744499055c482dcaccb0108660ab (diff) | |
| download | forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.gz forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.bz2 forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.xz forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.zip | |
Merge pull request #4058 from marc1706/ticket/13454
[ticket/13454] Remove unused variables, globals, and parameters
* marc1706/ticket/13454:
[ticket/13454] Add excessively removed code back
[ticket/13454] Remove more unused variables
[ticket/13454] Remove double semi-colons
[ticket/13454] Remove unused variables
[ticket/13454] Fix code sniffer complaints
[ticket/13454] Fix a few issues introduced by overdeleting stuff
[ticket/13454] Remove unused variables
[ticket/13454] Remove unused variables
[ticket/13454] Remove unused variables
[ticket/13454] Remove unused variables
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/driver/driver.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/driver/oracle.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/extractor/oracle_extractor.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/update_custom_bbcodes_with_idn.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/tools/tools.php | 2 |
7 files changed, 4 insertions, 9 deletions
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php index 5f06cb08fc..30cb667344 100644 --- a/phpBB/phpbb/db/driver/driver.php +++ b/phpBB/phpbb/db/driver/driver.php @@ -1012,7 +1012,7 @@ abstract class driver implements driver_interface */ function sql_report($mode, $query = '') { - global $cache, $starttime, $phpbb_root_path, $phpbb_path_helper, $user; + global $cache, $starttime, $phpbb_root_path, $phpbb_path_helper; global $request; if (is_object($request) && !$request->variable('explain', false)) diff --git a/phpBB/phpbb/db/driver/oracle.php b/phpBB/phpbb/db/driver/oracle.php index 89e1b68aac..54238a15ef 100644 --- a/phpBB/phpbb/db/driver/oracle.php +++ b/phpBB/phpbb/db/driver/oracle.php @@ -84,8 +84,6 @@ class oracle extends \phpbb\db\driver\driver * but I assume its because the Oracle extension provides a direct method to access it * without a query. */ - - $use_cache = false; /* global $cache; diff --git a/phpBB/phpbb/db/extractor/oracle_extractor.php b/phpBB/phpbb/db/extractor/oracle_extractor.php index 05f7b8ac95..79a991889b 100644 --- a/phpBB/phpbb/db/extractor/oracle_extractor.php +++ b/phpBB/phpbb/db/extractor/oracle_extractor.php @@ -192,8 +192,6 @@ class oracle_extractor extends base_extractor $ary_name[$i] = ocicolumnname($result, $i + 1); } - $sql_data = ''; - while ($row = $this->db->sql_fetchrow($result)) { $schema_vals = $schema_fields = array(); diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php index 9f6e3efb91..084d00a13a 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php @@ -118,7 +118,7 @@ class release_3_0_5_rc1 extends container_aware_migration $result = $this->db->sql_query($sql); // Skip first row, this is our original auth option we want to preserve - $row = $this->db->sql_fetchrow($result); + $this->db->sql_fetchrow($result); while ($row = $this->db->sql_fetchrow($result)) { diff --git a/phpBB/phpbb/db/migration/data/v31x/update_custom_bbcodes_with_idn.php b/phpBB/phpbb/db/migration/data/v31x/update_custom_bbcodes_with_idn.php index 854ed1f568..14b7b7b0f6 100644 --- a/phpBB/phpbb/db/migration/data/v31x/update_custom_bbcodes_with_idn.php +++ b/phpBB/phpbb/db/migration/data/v31x/update_custom_bbcodes_with_idn.php @@ -45,7 +45,6 @@ class update_custom_bbcodes_with_idn extends \phpbb\db\migration\migration $sql_ary = array(); while ($row = $this->db->sql_fetchrow($result)) { - $data = array(); if (preg_match('/(URL|LOCAL_URL|RELATIVE_URL)/', $row['bbcode_match'])) { $data = $bbcodes->build_regexp($row['bbcode_match'], $row['bbcode_tpl']); diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index a809bc14f9..d91860949a 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -535,7 +535,7 @@ class migrator } // Reverse the step that was run - $result = $this->run_step($reverse_step, false, !$revert); + $this->run_step($reverse_step, false, !$revert); } // rethrow the exception diff --git a/phpBB/phpbb/db/tools/tools.php b/phpBB/phpbb/db/tools/tools.php index 1d7b2ddfff..f06871a1d7 100644 --- a/phpBB/phpbb/db/tools/tools.php +++ b/phpBB/phpbb/db/tools/tools.php @@ -1116,7 +1116,7 @@ class tools implements tools_interface } // Get type - list($column_type, $orig_column_type) = $this->get_column_type($column_data[0]); + list($column_type) = $this->get_column_type($column_data[0]); // Adjust default value if db-dependent specified if (is_array($column_data[1])) |