From 270c1e21a25996ea57f05a073285145d2bae948d Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 14 Apr 2015 10:31:21 -0700
Subject: [PATCH] Fix for Youtube browser says 'no results' by default.

---
 e107_admin/image.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/e107_admin/image.php b/e107_admin/image.php
index 0cdabf58d..cd24949ac 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1395,10 +1395,10 @@ class media_admin_ui extends e_admin_ui
 
 			if(!empty($searchQry))
 			{
-				if(substr($searchQry,0,6) == 'video:') // YouTube video code?
+				if(substr($searchQry,0,6) == 'video:' || substr($searchQry,0,2) == 'v=') // YouTube video code?
 				{
 				//	return "video: ".$searchQry;
-					$searchQry = trim(substr($searchQry,6));
+					$searchQry = (substr($searchQry,0,2) == 'v=') ? trim(substr($searchQry,2)) : trim(substr($searchQry,6));
 					$data = array();
 					$data['entry'][0]['id'] =  $searchQry;
 					$data['entry'][0]['title'] = "Specified Video";
@@ -1415,9 +1415,6 @@ class media_admin_ui extends e_admin_ui
 
 					$code = $this->getYouTubeCode( $plData['entry'][0]['link'][0]['@attributes']['href']);
 
-
-				//	return print_a($searchQry,true);
-
 					if(!empty($plData))
 					{
 						$data = array();
@@ -1440,12 +1437,17 @@ class media_admin_ui extends e_admin_ui
 			else
 			{
 
-				$defaultAccount = e107::pref('core','youtube_default_account','e107inc');
+				$defaultAccount = e107::pref('core','youtube_default_account');
+				if(empty($defaultAccount))
+				{
+					$defaultAccount = 'e107inc';
+				}
+
 				$feed = "https://gdata.youtube.com/feeds/api/users/".$defaultAccount."/uploads";
 				$extension = 'youtube';
 			}
 
-
+		//return print_a($feed,true);
 
 			if(!empty($feed) && empty($data))
 			{