diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-12-14 18:45:04 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-12-14 18:45:04 +0100 |
| commit | be8140d79c3d8d34091ede40c056cd71fd4697b0 (patch) | |
| tree | 9a142497617c18cb239bd51e9869ee22d175f6b9 /phpBB/includes/config | |
| parent | bd334d318fb61992cedfdb7ca1306ad670f392a4 (diff) | |
| parent | 6e25b4231e11b8d5a08c5de0b498fb27b8598809 (diff) | |
| download | forums-be8140d79c3d8d34091ede40c056cd71fd4697b0.tar forums-be8140d79c3d8d34091ede40c056cd71fd4697b0.tar.gz forums-be8140d79c3d8d34091ede40c056cd71fd4697b0.tar.bz2 forums-be8140d79c3d8d34091ede40c056cd71fd4697b0.tar.xz forums-be8140d79c3d8d34091ede40c056cd71fd4697b0.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (158 commits)
[ticket/11015] Move comment in the right place.
[ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31
[ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.
[ticket/11015] Change permission adding in database updater to new style.
[ticket/11015] Change more docblocks to phpbb_db_driver.
[ticket/11015] Installer still needs 3.0-style dbms name.
[ticket/11262] Add .lock in cache directory to .gitignore
[ticket/11015] Include functions.php because it is not always included.
[ticket/11265] Add assertions for board installation success.
[ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
[ticket/11015] Convert database drivers to new spelling in post setup sync.
[ticket/11015] Convert connect test to the new syntax.
[ticket/11015] Restore whitespace to avoid conflict when merging develop.
[ticket/10975] Add a test for viewing a profile.
[ticket/10975] Test restricting by first character.
[ticket/10975] Avoid rewriting global config twice.
[ticket/10975] Test memberlist, not user creation.
[ticket/10975] Some quick tests to check the memberlist behaviour
[ticket/11162] Reformat.
[ticket/10491] Make recreate_database static.
...
Diffstat (limited to 'phpBB/includes/config')
| -rw-r--r-- | phpBB/includes/config/db.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php index 45f9f1cb21..b18369a479 100644 --- a/phpBB/includes/config/db.php +++ b/phpBB/includes/config/db.php @@ -29,7 +29,7 @@ class phpbb_config_db extends phpbb_config /** * Database connection - * @var dbal + * @var phpbb_db_driver */ protected $db; @@ -42,11 +42,11 @@ class phpbb_config_db extends phpbb_config /** * Creates a configuration container with a default set of values * - * @param dbal $db Database connection + * @param phpbb_db_driver $db Database connection * @param phpbb_cache_driver_interface $cache Cache instance * @param string $table Configuration table name */ - public function __construct(dbal $db, phpbb_cache_driver_interface $cache, $table) + public function __construct(phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $table) { $this->db = $db; $this->cache = $cache; |