mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-05 05:37:39 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Miloslav Hůla
2012-01-08 20:03:30 +01:00
parent 96d7236a4a 1d63af75f9
commit c65294075e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dibi/Nette/DibiNetteExtension.php
View File

@@ -23,7 +23,7 @@ class DibiNetteExtension extends Nette\Config\CompilerExtension
public function loadConfiguration() public function loadConfiguration()
{ {
$container = $this->getContainer(); $container = $this->getContainerBuilder();
$config = $this->getConfig(); $config = $this->getConfig();
$useProfiler = isset($config['profiler']) $useProfiler = isset($config['profiler'])

1
dibi/dibi.php
View File

@@ -37,7 +37,6 @@ require_once dirname(__FILE__) . '/libs/DibiDatabaseInfo.php';
require_once dirname(__FILE__) . '/libs/DibiEvent.php'; require_once dirname(__FILE__) . '/libs/DibiEvent.php';
require_once dirname(__FILE__) . '/libs/DibiFileLogger.php'; require_once dirname(__FILE__) . '/libs/DibiFileLogger.php';
require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php'; require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php';
require_once dirname(__FILE__) . '/Nette/DibiNettePanel.php';

6
dibi/libs/DibiConnection.php
View File

@@ -119,8 +119,10 @@ class DibiConnection extends DibiObject
$this->onEvent[] = array(new DibiFirePhpLogger($filter), 'logEvent'); $this->onEvent[] = array(new DibiFirePhpLogger($filter), 'logEvent');
} }
$panel = new DibiNettePanel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter); if (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPanel')) {
$panel->register($this); $panel = new DibiNettePanel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter);
$panel->register($this);
}
} }
$this->substitutes = new DibiHashMap(create_function('$expr', 'return ":$expr:";')); $this->substitutes = new DibiHashMap(create_function('$expr', 'return ":$expr:";'));