Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

This commit is contained in:
Shish 2014-12-31 13:16:24 +00:00
commit 92bc8b0709
3 changed files with 3 additions and 3 deletions

View File

@ -32,7 +32,7 @@ class CustomViewImageTheme extends ViewImageTheme {
if(!is_null($image->source)) {
$h_source = html_escape($image->source);
if(substr($image->source, 0, 7) != "http://") {
if(substr($image->source, 0, 7) != "http://" && substr($image->source, 0, 8) != "https://") {
$h_source = "http://" . $h_source;
}
$html .= "<br>Source: <a href='$h_source'>link</a>";

View File

@ -39,7 +39,7 @@ class CustomViewImageTheme extends ViewImageTheme {
if(!is_null($image->source)) {
$h_source = html_escape($image->source);
if(substr($image->source, 0, 7) != "http://") {
if(substr($image->source, 0, 7) != "http://" && substr($image->source, 0, 8) != "https://") {
$h_source = "http://" . $h_source;
}
$html .= "<br>Source: <a href='$h_source'>link</a>";

View File

@ -38,7 +38,7 @@ class CustomViewImageTheme extends ViewImageTheme {
if(!is_null($image->source)) {
$h_source = html_escape($image->source);
if(substr($image->source, 0, 7) != "http://") {
if(substr($image->source, 0, 7) != "http://" && substr($image->source, 0, 8) != "https://") {
$h_source = "http://" . $h_source;
}
$html .= "<br>Source: <a href='$h_source'>link</a>";