diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php index bec17b3ed..55ee4543b 100644 --- a/library/Icinga/Web/View.php +++ b/library/Icinga/Web/View.php @@ -59,13 +59,6 @@ class View extends Zend_View_Abstract */ const CHARSET = 'UTF-8'; - /** - * Flag to register stream wrapper - * - * @var bool - */ - private $useViewStream = false; - /** * Registered helper functions */ @@ -86,13 +79,6 @@ class View extends Zend_View_Abstract */ public function __construct($config = array()) { - $this->useViewStream = (bool) ini_get('short_open_tag') ? false : true; - if ($this->useViewStream) { - if (!in_array('zend.view', stream_get_wrappers())) { - stream_wrapper_register('zend.view', '\Icinga\Web\ViewStream'); - } - } - $config['helperPath']['Icinga\\Web\\View\\Helper\\'] = Icinga::app()->getLibraryDir('Icinga/Web/View/Helper'); parent::__construct($config); @@ -258,11 +244,8 @@ class View extends Zend_View_Abstract // Exporting global variables to view scripts: $$k = $v; } - if ($this->useViewStream) { - include 'zend.view://' . func_get_arg(0); - } else { - include func_get_arg(0); - } + + include func_get_arg(0); } /** diff --git a/library/Icinga/Web/ViewStream.php b/library/Icinga/Web/ViewStream.php deleted file mode 100644 index 46227ac8b..000000000 --- a/library/Icinga/Web/ViewStream.php +++ /dev/null @@ -1,13 +0,0 @@ -