diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-07 18:09:51 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-07 18:09:51 +0000 |
| commit | 0c19784ab9e5dae7828b3ebca619ec9fd1c301a7 (patch) | |
| tree | 3c0f087241b522a2adf7686aa133c74a26b1833a | |
| parent | a539fca62b10f53a5f5dadf07f9ab07340fdabf9 (diff) | |
| download | forums-0c19784ab9e5dae7828b3ebca619ec9fd1c301a7.tar forums-0c19784ab9e5dae7828b3ebca619ec9fd1c301a7.tar.gz forums-0c19784ab9e5dae7828b3ebca619ec9fd1c301a7.tar.bz2 forums-0c19784ab9e5dae7828b3ebca619ec9fd1c301a7.tar.xz forums-0c19784ab9e5dae7828b3ebca619ec9fd1c301a7.zip | |
for the time being pushed to 3.2.x
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9560 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/Zend/Exception.php | 30 | ||||
| -rw-r--r-- | phpBB/includes/Zend/loader.php | 58 | ||||
| -rw-r--r-- | phpBB/includes/ezcomponents/loader.php | 73 |
3 files changed, 0 insertions, 161 deletions
diff --git a/phpBB/includes/Zend/Exception.php b/phpBB/includes/Zend/Exception.php deleted file mode 100644 index 599d8a033e..0000000000 --- a/phpBB/includes/Zend/Exception.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Zend Framework - * - * LICENSE - * - * This source file is subject to the new BSD license that is bundled - * with this package in the file LICENSE.txt. - * It is also available through the world-wide-web at this URL: - * http://framework.zend.com/license/new-bsd - * If you did not receive a copy of the license and are unable to - * obtain it through the world-wide-web, please send an email - * to license@zend.com so we can send you a copy immediately. - * - * @category Zend - * @package Zend - * @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ - - -/** - * @category Zend - * @package Zend - * @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ -class Zend_Exception extends Exception -{} - diff --git a/phpBB/includes/Zend/loader.php b/phpBB/includes/Zend/loader.php deleted file mode 100644 index 99a5543901..0000000000 --- a/phpBB/includes/Zend/loader.php +++ /dev/null @@ -1,58 +0,0 @@ -<?php -/** -* -* @package zend -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (version_compare(PHP_VERSION, '5.2.4', '<') || !function_exists('spl_autoload_register')) -{ - trigger_error('PHP >= 5.2.4 and spl_autoload_register() required', E_USER_ERROR); -} - -/** -* Autoload function for Zend framework classes -*/ -function phpbb_zend_autoload($class_name) -{ - global $phpbb_root_path; - - if (strpos($class_name, '_') !== false) - { - $path = str_replace('_', '/', $class_name) . '.php'; - require("{$phpbb_root_path}includes/" . $path); - return true; - } -} - -/** -* @ignore -*/ -// make sure Zend is in the include path -ini_set( 'include_path', ini_get( 'include_path' ) . PATH_SEPARATOR . $phpbb_root_path . 'includes' ); - -// check whether a regular autoload function already exists, so we can load it into the spl stack afterwards -$register_autoload = false; -if (function_exists('__autoload')) -{ - $register_autoload = true; -} - -spl_autoload_register('phpbb_zend_autoload'); - -// load the old autoload function into the spl stack if necessary -if ($register_autoload) -{ - spl_autoload_register('__autoload'); -}
\ No newline at end of file diff --git a/phpBB/includes/ezcomponents/loader.php b/phpBB/includes/ezcomponents/loader.php deleted file mode 100644 index 62aaa7667d..0000000000 --- a/phpBB/includes/ezcomponents/loader.php +++ /dev/null @@ -1,73 +0,0 @@ -<?php -/** -* -* @package ezcomponents -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* eZ components class loader -* Replaces the autoload mechanism eZ Components normally use -* @package ezcomponents -*/ -class phpbb_ezcomponents_loader -{ - var $loaded; - - /** - * Constructor which makes sure the PHP version requirement is met. - */ - function phpbb_ezcomponents_loader() - { - $this->loaded = array(); - if (version_compare(PHP_VERSION, '5.2.1', '<')) - { - trigger_error('PHP >= 5.2.1 required', E_USER_ERROR); - } - } - - /** - * Loads all classes of a particular component. - * The base component is always loaded first. - * - * @param $component string Lower case component name - */ - function load_component($component) - { - global $phpbb_root_path; - - // don't allow loading the same component twice - if (isset($this->loaded[$component]) && $this->loaded[$component]) - { - return; - } - - // make sure base is always loaded first - if ($component != 'base' && !isset($this->loaded['base'])) - { - $this->load_component('base'); - } - - $ezc_path = $phpbb_root_path . 'includes/ezcomponents/'; - - // retrieve the autoload list - $classes = include($ezc_path . ucfirst($component) . '/' . $component . '_autoload.php'); - - // include all files related to this component - foreach ($classes as $class => $path) - { - include($ezc_path . $path); - } - } -}
\ No newline at end of file |