From e019c60fdad07ebb7cc1adcbe0a103d58211e575 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 8 Jan 2010 12:07:45 -0700 Subject: [PATCH] Track Horde_Mime_Viewer changes. --- gollem/lib/Mime/Viewer/Images.php | 5 ++--- whups/lib/Mime/Viewer/Zip.php | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gollem/lib/Mime/Viewer/Images.php b/gollem/lib/Mime/Viewer/Images.php index ff4a74aab..365237203 100644 --- a/gollem/lib/Mime/Viewer/Images.php +++ b/gollem/lib/Mime/Viewer/Images.php @@ -19,11 +19,10 @@ class Gollem_Horde_Mime_Viewer_Images extends Horde_Mime_Viewer_Images * @var boolean */ protected $_capability = array( - 'embedded' => false, - 'forceinline' => false, 'full' => true, 'info' => false, - 'inline' => false + 'inline' => false, + 'raw' => false ); /** diff --git a/whups/lib/Mime/Viewer/Zip.php b/whups/lib/Mime/Viewer/Zip.php index 17825dff3..2d97a4c68 100644 --- a/whups/lib/Mime/Viewer/Zip.php +++ b/whups/lib/Mime/Viewer/Zip.php @@ -28,7 +28,7 @@ class Whups_Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Zip protected function _render() { if (!Horde_Util::getFormData('zip_attachment')) { - $this->_callback = array(&$this, '_WhupsCallback'); + $this->_callback = array($this, '_whupsCallback'); return parent::_render(); } @@ -62,10 +62,10 @@ class Whups_Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Zip * * @return array See Horde_Mime_Viewer_Driver::render(). */ - protected function _renderInline() + protected function _renderInfo() { - $this->_callback = array(&$this, '_WhupsCallback'); - return parent::_renderInline(); + $this->_callback = array($this, '_whupsCallback'); + return parent::_renderInfo(); } /** @@ -76,7 +76,7 @@ class Whups_Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Zip * * @return string The content-type of the output. */ - protected function _WhupsCallback($key, $val) + protected function _whupsCallback($key, $val) { $name = preg_replace('/( )+$/', '', $val['name']); -- 2.11.0