diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-11-27 20:37:34 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-11-27 20:37:34 +0000 |
commit | d7a63ff98814c19108808624b957c6335c58caa5 (patch) | |
tree | 57ad3b8e0f6e8548665921e3ddad1f0b9614f945 /includes/database/select.inc | |
parent | 84c72d06f03163115ae9bbc939e6ab2dbc65eb28 (diff) | |
download | brdo-d7a63ff98814c19108808624b957c6335c58caa5.tar.gz brdo-d7a63ff98814c19108808624b957c6335c58caa5.tar.bz2 |
- Patch #851136 by Damien Tournoud, Crell, chx: make the database autoloading more robust.
Diffstat (limited to 'includes/database/select.inc')
-rw-r--r-- | includes/database/select.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/database/select.inc b/includes/database/select.inc index 7780fc5cd..b0d0eb275 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -6,6 +6,8 @@ * @{ */ +require_once dirname(__FILE__) . '/query.inc'; + /** * Interface for extendable query objects. * @@ -642,7 +644,9 @@ class SelectQueryExtender implements SelectQueryInterface { /* Implementations of QueryExtendableInterface. */ public function extend($extender_name) { - $class = $this->connection->getDriverClass($extender_name); + // The extender can be anywhere so this needs to go to the registry, which + // is surely loaded by now. + $class = $this->connection->getDriverClass($extender_name, array(), TRUE); return new $class($this, $this->connection); } |