diff options
author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-04-24 10:02:35 +0400 |
---|---|---|
committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-04-24 10:02:35 +0400 |
commit | 8de891ce64e15b9aac54932d71cc93fbdce88e02 (patch) | |
tree | 3758571c220b5026710c41d4254af4bd40d45724 /libs/Zend/Log/Writer | |
parent | 662b70ee405032fab1015e19bd5351739c5c8543 (diff) |
fixes #1312
- index.php, piwik.php - no longer set include path
- libs/Zend - comment out require_once per http://www.zendframework.com/manual/e
n/performance.classloading.html
- libs/Zend - comment out some redundant Zend_Loader::loadClass() calls
- libs/HTML - use absolute include paths
- libs/open-flash-chart/php-ofc-library - use absolute include paths
Diffstat (limited to 'libs/Zend/Log/Writer')
-rw-r--r-- | libs/Zend/Log/Writer/Abstract.php | 4 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Db.php | 6 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Firebug.php | 8 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Mail.php | 6 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Mock.php | 2 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Null.php | 2 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Stream.php | 12 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/Syslog.php | 2 | ||||
-rw-r--r-- | libs/Zend/Log/Writer/ZendMonitor.php | 2 |
9 files changed, 22 insertions, 22 deletions
diff --git a/libs/Zend/Log/Writer/Abstract.php b/libs/Zend/Log/Writer/Abstract.php index 979375a83f..80b939db18 100644 --- a/libs/Zend/Log/Writer/Abstract.php +++ b/libs/Zend/Log/Writer/Abstract.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Priority */ -require_once 'Zend/Log/Filter/Priority.php'; +// require_once 'Zend/Log/Filter/Priority.php'; /** * @category Zend @@ -118,7 +118,7 @@ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); diff --git a/libs/Zend/Log/Writer/Db.php b/libs/Zend/Log/Writer/Db.php index 63660aec6f..6f77a12cb7 100644 --- a/libs/Zend/Log/Writer/Db.php +++ b/libs/Zend/Log/Writer/Db.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend @@ -98,7 +98,7 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract */ public function setFormatter($formatter) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception(get_class() . ' does not support formatting'); } @@ -121,7 +121,7 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract protected function _write($event) { if ($this->_db === null) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Database adapter is null'); } diff --git a/libs/Zend/Log/Writer/Firebug.php b/libs/Zend/Log/Writer/Firebug.php index 5afd752401..585f6a3dc1 100644 --- a/libs/Zend/Log/Writer/Firebug.php +++ b/libs/Zend/Log/Writer/Firebug.php @@ -21,16 +21,16 @@ */ /** Zend_Log */ -require_once 'Zend/Log.php'; +// require_once 'Zend/Log.php'; /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Firebug */ -require_once 'Zend/Log/Formatter/Firebug.php'; +// require_once 'Zend/Log/Formatter/Firebug.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; +// require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** * Writes log messages to the Firebug Console via FirePHP. diff --git a/libs/Zend/Log/Writer/Mail.php b/libs/Zend/Log/Writer/Mail.php index 2d47670e1d..70f57b8616 100644 --- a/libs/Zend/Log/Writer/Mail.php +++ b/libs/Zend/Log/Writer/Mail.php @@ -21,13 +21,13 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Exception */ -require_once 'Zend/Log/Exception.php'; +// require_once 'Zend/Log/Exception.php'; /** Zend_Log_Formatter_Simple*/ -require_once 'Zend/Log/Formatter/Simple.php'; +// require_once 'Zend/Log/Formatter/Simple.php'; /** * Class used for writing log messages to email via Zend_Mail. diff --git a/libs/Zend/Log/Writer/Mock.php b/libs/Zend/Log/Writer/Mock.php index f946219a9f..1e14a2f00e 100644 --- a/libs/Zend/Log/Writer/Mock.php +++ b/libs/Zend/Log/Writer/Mock.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Log/Writer/Null.php b/libs/Zend/Log/Writer/Null.php index d86b69b583..f281883fbb 100644 --- a/libs/Zend/Log/Writer/Null.php +++ b/libs/Zend/Log/Writer/Null.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Log/Writer/Stream.php b/libs/Zend/Log/Writer/Stream.php index fdf924efdc..b722dbb4bd 100644 --- a/libs/Zend/Log/Writer/Stream.php +++ b/libs/Zend/Log/Writer/Stream.php @@ -21,10 +21,10 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Simple */ -require_once 'Zend/Log/Formatter/Simple.php'; +// require_once 'Zend/Log/Formatter/Simple.php'; /** * @category Zend @@ -57,12 +57,12 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract if (is_resource($streamOrUrl)) { if (get_resource_type($streamOrUrl) != 'stream') { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Resource is not a stream'); } if ($mode != 'a') { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Mode cannot be changed on existing streams'); } @@ -73,7 +73,7 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract } if (! $this->_stream = @fopen($streamOrUrl, $mode, false)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; $msg = "\"$streamOrUrl\" cannot be opened with mode \"$mode\""; throw new Zend_Log_Exception($msg); } @@ -128,7 +128,7 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract $line = $this->_formatter->format($event); if (false === @fwrite($this->_stream, $line)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Unable to write to stream"); } } diff --git a/libs/Zend/Log/Writer/Syslog.php b/libs/Zend/Log/Writer/Syslog.php index 96fbe56922..310bcf54ec 100644 --- a/libs/Zend/Log/Writer/Syslog.php +++ b/libs/Zend/Log/Writer/Syslog.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * Writes log messages to syslog diff --git a/libs/Zend/Log/Writer/ZendMonitor.php b/libs/Zend/Log/Writer/ZendMonitor.php index 082f2a4f58..59a648fa8b 100644 --- a/libs/Zend/Log/Writer/ZendMonitor.php +++ b/libs/Zend/Log/Writer/ZendMonitor.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend |