Merge branch 'master' of ../save/merge/frio into frio_merge

[friendica.git] / view / theme / diabook / theme.php

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index d3620177ecacc2d7229f3363d42d0d455e5384e4..972ad2e7cbf224b2ab5250d40bed52033c676bbc 100644 (file)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -174,9 +174,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $imageresizeJS);
        //load jquery.ui.js
        if($ccCookie != "9") {
-       $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js";
+       $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui.min.js";
        $a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $jqueryuiJS);
-       $jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui-1.8.20.custom.css";
+       $jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui.min.css";
        $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $jqueryuicssJS);
        }
        
@@ -408,7 +408,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        }}
 
        // last 12 users
-       if($close_lastusers != "1") {
+       if(($close_lastusers != "1") AND !get_config('diabook','disable_features')) {
        $aside['$lastusers_title'] = t('Last users');
        $aside['$lastusers_items'] = array();
        $sql_extra = "";
@@ -437,7 +437,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        }}
 
        // last 10 liked items
-       if($close_lastlikes != "1") {
+       if(($close_lastlikes != "1") AND !get_config('diabook','disable_features')) {
        $aside['$like_title'] = t('Last likes');
        $aside['$like_items'] = array();
        $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
@@ -482,7 +482,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
        }}
 
        // last 12 photos
-       if($close_lastphotos != "1") {
+       if(($close_lastphotos != "1")  AND !get_config('diabook','disable_features')) {
        $aside['$photos_title'] = t('Last photos');
        $aside['$photos_items'] = array();
        $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM