From b869d66e44095bc7ac5e4cbd2dde2ef9217a65df Mon Sep 17 00:00:00 2001
From: Horus3
Date: Mon, 24 Feb 2014 19:09:58 +0100
Subject: .

---
 www/youtube.php   | 10 +++++-----
 www/zend_init.php |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/youtube.php b/www/youtube.php
index 13829fa..0843299 100644
--- a/www/youtube.php
+++ b/www/youtube.php
@@ -1,11 +1,11 @@
 <?php
 
-include("zend_init.php");
+require("zend_init.php");
 
-function getAndPrintVideoFeed($location = Zend_Gdata_YouTube::VIDEO_URI)
+function getAndPrintVideoFeed($location, $yt)
 {
-$yt = new Zend_Gdata_YouTube();
-$yt->setMajorProtocolVersion(2);
+//$yt = new Zend_Gdata_YouTube();
+//$yt->setMajorProtocolVersion(2);
 
 $videoFeed = $yt->getVideoFeed($location);
   printVideoFeed($videoFeed);
@@ -79,7 +79,7 @@ function get_video(){
 		return $string;
 }
 
-getAndPrintVideoFeed();
+getAndPrintVideoFeed($location = Zend_Gdata_YouTube::VIDEO_URI, $yt);
 
 $searchstring = get_video();
 
diff --git a/www/zend_init.php b/www/zend_init.php
index 3089906..abfad93 100644
--- a/www/zend_init.php
+++ b/www/zend_init.php
@@ -6,5 +6,3 @@ require_once 'Zend/Loader.php'; // the Zend dir must be in your include_path
 Zend_Loader::loadClass('Zend_Gdata_YouTube');
 $yt = new Zend_Gdata_YouTube();
 $yt->setMajorProtocolVersion(2);
-
-return $yt;
-- 
cgit v1.2.3