1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00

Fix for Youtube browser says 'no results' by default.

This commit is contained in:
Cameron
2015-04-14 10:31:21 -07:00
parent 2c4b2998ee
commit 270c1e21a2

View File

@@ -1395,10 +1395,10 @@ class media_admin_ui extends e_admin_ui
if(!empty($searchQry)) 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; // 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 = array();
$data['entry'][0]['id'] = $searchQry; $data['entry'][0]['id'] = $searchQry;
$data['entry'][0]['title'] = "Specified Video"; $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']); $code = $this->getYouTubeCode( $plData['entry'][0]['link'][0]['@attributes']['href']);
// return print_a($searchQry,true);
if(!empty($plData)) if(!empty($plData))
{ {
$data = array(); $data = array();
@@ -1440,12 +1437,17 @@ class media_admin_ui extends e_admin_ui
else 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"; $feed = "https://gdata.youtube.com/feeds/api/users/".$defaultAccount."/uploads";
$extension = 'youtube'; $extension = 'youtube';
} }
//return print_a($feed,true);
if(!empty($feed) && empty($data)) if(!empty($feed) && empty($data))
{ {