aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-07-04 21:08:36 +0200
committerNils Adermann <naderman@naderman.de>2014-07-04 21:08:36 +0200
commite97fab49e2ce73a8cc179a934ed8c0a05057bda3 (patch)
treeef1a9f196e258b2a1297b84b59583fdab65d59d7 /phpBB/includes/message_parser.php
parent4558262e2aaf31b4583a87622e97a46ead11537c (diff)
parent53ff23671c2706c13bbe8ecca6b29b3c3456768b (diff)
downloadforums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar
forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.gz
forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.bz2
forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.tar.xz
forums-e97fab49e2ce73a8cc179a934ed8c0a05057bda3.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 8d926ec70a..da27d8900d 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1350,7 +1350,7 @@ class parse_message extends bbcode_firstpass
// NOTE: obtain_* function? chaching the table contents?
// For now setting the ttl to 10 minutes
- switch ($db->sql_layer)
+ switch ($db->get_sql_layer())
{
case 'mssql':
case 'mssql_odbc':