diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Layout.php
--- a/web/lib/Zend/Layout.php	Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Layout.php	Thu Mar 21 19:50:53 2013 +0100
@@ -14,9 +14,9 @@
  *
  * @category   Zend
  * @package    Zend_Layout
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version    $Id: Layout.php 25263 2013-02-18 11:48:02Z frosch $
  */
 
 /**
@@ -24,7 +24,7 @@
  *
  * @category   Zend
  * @package    Zend_Layout
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Layout
@@ -174,12 +174,12 @@
     {
         if (null === self::$_mvcInstance) {
             self::$_mvcInstance = new self($options, true);
-        }
-
-        if (is_string($options)) {
-            self::$_mvcInstance->setLayoutPath($options);
-        } elseif (is_array($options) || $options instanceof Zend_Config) {
-            self::$_mvcInstance->setOptions($options);
+        } else {
+            if (is_string($options)) {
+                self::$_mvcInstance->setLayoutPath($options);
+            } elseif (is_array($options) || $options instanceof Zend_Config) {
+                self::$_mvcInstance->setOptions($options);
+            }
         }
 
         return self::$_mvcInstance;