Подключение от ZF1 заменяем на ZF2

Исправление несоответствия подключения от ZF1 и самого ZF2.
torrentpier · Nov 24, 2014 · 449b519 · 449b519
1 parent 0387f38
commit 449b519
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ internal_data/captcha/**/
 internal_data/log/
 internal_data/sitemap/*.xml
 internal_data/triggers/
+library/config.local.php
 
 ### Archives ###
 *.log

diff --git a/common.php b/common.php
@@ -20,8 +20,8 @@
 require(BB_ROOT . 'library/config.php');
 
 // Load Zend Framework
-require(CLASS_DIR . 'zendLoader.php');
-ZendLoader::getInstance()->setupAutoloader(BB_ROOT . '/library');
+require_once(BB_ROOT . 'library/Zend/Loader/AutoloaderFactory.php');
+Zend\Loader\AutoloaderFactory::factory(array());
 
 $server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://';
 $server_port = (in_array($bb_cfg['server_port'], array(80, 443))) ? '' : ':' . $bb_cfg['server_port'];

diff --git a/library/includes/classes/zendLoader.php b/library/includes/classes/zendLoader.php