import v1.1.0_RC2 | 2009-09-20
This commit is contained in:
@ -18,12 +18,13 @@
|
||||
* @subpackage App
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: App.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
*/
|
||||
|
||||
/**
|
||||
* Zend_Gdata_Feed
|
||||
*/
|
||||
require_once 'Zend/Gdata/Feed.php';
|
||||
require_once 'Zend/Gdata/App/Feed.php';
|
||||
|
||||
/**
|
||||
* Zend_Gdata_Http_Client
|
||||
@ -827,7 +828,7 @@ class Zend_Gdata_App
|
||||
* @param string $className The class which is used as the return type
|
||||
* @param string $useIncludePath Whether the include_path should be searched
|
||||
* @throws Zend_Gdata_App_Exception
|
||||
* @return Zend_Gdata_Feed
|
||||
* @return Zend_Gdata_App_Feed
|
||||
*/
|
||||
public static function importFile($filename,
|
||||
$className='Zend_Gdata_App_Feed', $useIncludePath = false)
|
||||
@ -1020,7 +1021,9 @@ class Zend_Gdata_App
|
||||
$foundClassName = null;
|
||||
foreach ($this->_registeredPackages as $name) {
|
||||
try {
|
||||
if (!class_exists($name . '_' . $class)) {
|
||||
// Autoloading disabled on next line for compatibility
|
||||
// with magic factories. See ZF-6660.
|
||||
if (!class_exists($name . '_' . $class, false)) {
|
||||
require_once 'Zend/Loader.php';
|
||||
@Zend_Loader::loadClass($name . '_' . $class);
|
||||
}
|
||||
|
Reference in New Issue
Block a user