6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_beta1 | 2009-08-21

Browse Source
This commit is contained in:
6543
2019-07-17 22:16:19 +02:00
parent 2c1152f0d3
commit 8dee6b1a10
2306 changed files with 251360 additions and 23428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/Zend/Layout.php
View File

@ -16,7 +16,7 @@
* @package Zend_Layout
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Layout.php 11375 2008-09-12 17:37:30Z ralph $
* @version $Id: Layout.php 15577 2009-05-14 12:43:34Z matthew $
*/
/**
@ -174,6 +174,8 @@ class Zend_Layout
{
if (null === self::$_mvcInstance) {
self::$_mvcInstance = new self($options, true);
} elseif (is_string($options)) {
self::$_mvcInstance->setLayoutPath($options);
} else {
self::$_mvcInstance->setOptions($options);
}
@ -262,8 +264,10 @@ class Zend_Layout
require_once 'Zend/Controller/Front.php';
$front = Zend_Controller_Front::getInstance();
if (!$front->hasPlugin($pluginClass)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($pluginClass);
if (!class_exists($pluginClass)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($pluginClass);
}
$front->registerPlugin(
// register to run last | BUT before the ErrorHandler (if its available)
new $pluginClass($this),
@ -282,8 +286,10 @@ class Zend_Layout
$helperClass = $this->getHelperClass();
require_once 'Zend/Controller/Action/HelperBroker.php';
if (!Zend_Controller_Action_HelperBroker::hasHelper('layout')) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($helperClass);
if (!class_exists($helperClass)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($helperClass);
}
Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-90, new $helperClass($this));
}
}