CC-3307: airtime-full-install fails on Ubuntu 11.10

This commit is contained in:
Martin Konecny 2012-02-08 11:42:21 -05:00
parent 82459d257f
commit 6c0f035b0b
3 changed files with 14 additions and 0 deletions

View file

@ -24,6 +24,11 @@ set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_pat
//Controller plugins. //Controller plugins.
set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path()); set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path());
//Zend framework
if (file_exists('/usr/share/php/libzend-framework-php')){
set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
}
/** Zend_Application */ /** Zend_Application */
require_once 'Zend/Application.php'; require_once 'Zend/Application.php';

View file

@ -1,5 +1,9 @@
<?php <?php
set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
//Zend framework
if (file_exists('/usr/share/php/libzend-framework-php')){
set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
}
require_once('Zend/Loader/Autoloader.php'); require_once('Zend/Loader/Autoloader.php');
require_once('DB.php'); require_once('DB.php');

View file

@ -6,6 +6,11 @@ $airtimeIni = getAirtimeConf();
$airtime_base_dir = $airtimeIni['general']['airtime_dir']; $airtime_base_dir = $airtimeIni['general']['airtime_dir'];
set_include_path("$airtime_base_dir/library" . PATH_SEPARATOR . get_include_path()); set_include_path("$airtime_base_dir/library" . PATH_SEPARATOR . get_include_path());
//Zend framework
if (file_exists('/usr/share/php/libzend-framework-php')){
set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
}
require_once('Zend/Loader/Autoloader.php'); require_once('Zend/Loader/Autoloader.php');
$autoloader = Zend_Loader_Autoloader::getInstance(); $autoloader = Zend_Loader_Autoloader::getInstance();