Cache factory creation

horde · Apr 17, 2014 · 5cbc4ec · 5cbc4ec
1 parent 97c2a27
commit 5cbc4ec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php
@@ -1080,6 +1080,8 @@ public function isAttachment($mime_type)
      */
     protected function _buildMessage($parts = null)
     {
+        global $injector;
+
         if (is_null($parts)) {
             if ($this->_build) {
                 return;
@@ -1094,6 +1096,8 @@ protected function _buildMessage($parts = null)
         $last_id = null;
         $to_process = array();
 
+        $mv_factory = $injector->getInstance('IMP_Factory_MimeViewer');
+
         foreach ($parts as $id) {
             if (!is_null($last_id) &&
                 (strpos($id, $last_id) === 0)) {
@@ -1103,7 +1107,7 @@ protected function _buildMessage($parts = null)
             $last_id = null;
 
             $mime_part = $this->getMIMEPart($id, array('nocontents' => true));
-            $viewer = $GLOBALS['injector']->getInstance('IMP_Factory_MimeViewer')->create($mime_part, array('contents' => $this));
+            $viewer = $mv_factory->create($mime_part, array('contents' => $this));
             if ($viewer->embeddedMimeParts()) {
                 $mime_part = $this->getMIMEPart($id);
                 $viewer->setMIMEPart($mime_part);