1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00

Fixes #1762 - Media-Manager Youtube thumbnail should use https. Removed debug info on db_verify. Hide carousel navigation when only 1 slide present.

This commit is contained in:
Cameron
2016-07-06 09:58:17 -07:00
parent 708db3597a
commit 2a14308600
3 changed files with 38 additions and 21 deletions

View File

@@ -1478,7 +1478,7 @@ class media_admin_ui extends e_admin_ui
$data = array(); $data = array();
$data['items'][0]['id']['videoId'] = $searchQry; $data['items'][0]['id']['videoId'] = $searchQry;
$data['items'][0]['snippet']['thumbnails']['medium']['url'] = "http://i.ytimg.com/vi/".$searchQry."/mqdefault.jpg"; $data['items'][0]['snippet']['thumbnails']['medium']['url'] = "https://i.ytimg.com/vi/".$searchQry."/mqdefault.jpg";
$data['items'][0]['snippet']['title'] = 'Specified Video'; $data['items'][0]['snippet']['title'] = 'Specified Video';
} }
elseif(substr($searchQry,0,9) == 'playlist:') // playlist elseif(substr($searchQry,0,9) == 'playlist:') // playlist

View File

@@ -201,6 +201,13 @@ class db_verify
$this->currentTable = $selection; $this->currentTable = $selection;
if(!isset($this->tables[$selection])) // doesn't have an SQL file.
{
// e107::getMessage()->addDebug("No SQL File for ".$selection);
return false;
}
if(empty($this->tables[$selection]['tables'])) if(empty($this->tables[$selection]['tables']))
{ {
//$this->internalError = true; //$this->internalError = true;

View File

@@ -604,7 +604,11 @@ class e_form
$text =' $text ='
<!-- Carousel --> <!-- Carousel -->
<div id="'.$name.'" class="carousel slide" data-ride="carousel" '.$interval.' '.$wrap.' '.$pause.'> <div id="'.$name.'" class="carousel slide" data-ride="carousel" '.$interval.' '.$wrap.' '.$pause.'>';
if(count($array) > 1)
{
$text .= '
<!-- Indicators --> <!-- Indicators -->
<ol class="carousel-indicators"> <ol class="carousel-indicators">
'; ';
@@ -618,7 +622,10 @@ class e_form
} }
$text .= ' $text .= '
</ol> </ol>';
}
$text .= '
<div class="carousel-inner"> <div class="carousel-inner">
'; ';
@@ -643,6 +650,8 @@ class e_form
$text .= ' $text .= '
</div>'; </div>';
if(count($array) > 1)
{
$text .= ' $text .= '
<a class="left carousel-control" href="#'.$name.'" role="button" data-slide="prev"> <a class="left carousel-control" href="#'.$name.'" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span> <span class="glyphicon glyphicon-chevron-left"></span>
@@ -650,6 +659,7 @@ class e_form
<a class="right carousel-control" href="#'.$name.'" role="button" data-slide="next"> <a class="right carousel-control" href="#'.$name.'" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span> <span class="glyphicon glyphicon-chevron-right"></span>
</a>'; </a>';
}
$text .= '</div><!-- End Carousel -->'; $text .= '</div><!-- End Carousel -->';