From 6c0f035b0b936fb58b0dd5bda5e24995ab8414c0 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 8 Feb 2012 11:42:21 -0500
Subject: [PATCH] CC-3307: airtime-full-install fails on Ubuntu 11.10

---
 airtime_mvc/public/index.php               | 5 +++++
 install_minimal/include/AirtimeInstall.php | 4 ++++
 utils/airtime-log.php                      | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index 5a4edab44..6e52ae6f0 100644
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@@ -24,6 +24,11 @@ set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_pat
 //Controller plugins.
 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 */
 require_once 'Zend/Application.php';
 
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 42c17619f..606d74e55 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -1,5 +1,9 @@
 <?php
 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('DB.php');
 
diff --git a/utils/airtime-log.php b/utils/airtime-log.php
index 664432715..93b226ef0 100644
--- a/utils/airtime-log.php
+++ b/utils/airtime-log.php
@@ -6,6 +6,11 @@ $airtimeIni = getAirtimeConf();
 $airtime_base_dir = $airtimeIni['general']['airtime_dir'];
 
 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');
 $autoloader = Zend_Loader_Autoloader::getInstance();