diff --git a/app/widgets/ContactSummary/ContactSummary.php b/app/widgets/ContactSummary/ContactSummary.php index 3eecb8a91..65e824bff 100644 --- a/app/widgets/ContactSummary/ContactSummary.php +++ b/app/widgets/ContactSummary/ContactSummary.php @@ -81,23 +81,21 @@ class ContactSummary extends WidgetCommon if($_GET['f'] == $this->user->getLogin()) { $contact = $cd->get($this->user->getLogin()); - } else { + } /*else { $contact = $cd->getRosterItem($_GET['f']); $refresh = true; - } + }*/ if(!isset($contact)) { $contact = $cd->get($_GET['f']); - $refresh = false; + //$refresh = false; } ?>
prepareContactSummary($contact); - } - - if($refresh == true) { + } else { $contact = new modl\Contact(); echo $this->prepareContactSummary($contact); ?> diff --git a/app/widgets/WidgetCommon/WidgetCommon.php b/app/widgets/WidgetCommon/WidgetCommon.php index af3495bce..6a04d2200 100644 --- a/app/widgets/WidgetCommon/WidgetCommon.php +++ b/app/widgets/WidgetCommon/WidgetCommon.php @@ -191,6 +191,16 @@ class WidgetCommon extends WidgetBase {
'; } + + if($url['host'] == 'youtu.be') { + $enc .= ' + + + + +
'; + } + $enc .= ' '.$url['scheme'].'://'.$url['host'].$url['path'].' @@ -198,7 +208,7 @@ class WidgetCommon extends WidgetBase { } } } - // + return $enc; } diff --git a/system/Route.php b/system/Route.php index 9e5cb81a1..6f6ce1c61 100644 --- a/system/Route.php +++ b/system/Route.php @@ -80,7 +80,7 @@ class Route extends \ControllerBase { \system\Logs\Logger::log(t('Route error, please set all the parameters for the page %s', $page)); else { //We construct a classic URL if the rewriting is disabled - if(!isset($_SERVER['HTTP_MOD_REWRITE']) && !$_SERVER['HTTP_MOD_REWRITE']) { + if(!isset($_SERVER['HTTP_MOD_REWRITE']) || !$_SERVER['HTTP_MOD_REWRITE']) { $uri = BASE_URI.'?q='.$page; if($params != false && is_array($params)) {