Merge remote branch 'upstream/master'

diff --git a/htconfig.php b/htconfig.php
index 872572654a705cec36d5f39d43353d4f7fd64209..2c5658be4dc5fdb9f5ad812fa0668b9a6bb453de 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -88,3 +88,6 @@ $a->config['system']['itemcache'] = "";
 
 // If enabled, the lockpath is used for a lockfile to check if the poller is running
 $a->config['system']['lockpath'] = "";
+
+// If enabled, the MyBB fulltext engine is used
+$a->config['system']['use_fulltext_engine'] = true;

diff --git a/include/api.php b/include/api.php
index a693a32c8bb3c797a4d20afa62493ed3d4bf2ce2..5697fbdbcb881c35365cdacbb525a43fa120ec76 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -4,26 +4,26 @@
        require_once("conversation.php");
        require_once("oauth.php");
        require_once("html2plain.php");
-       /* 
+       /*
         * Twitter-Like API
-        *  
+        *
         */
 
        $API = Array();
-       $called_api = Null; 
+       $called_api = Null;
 
        function api_date($str){
                //Wed May 23 06:01:13 +0000 2007
                return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
        }
-        
-       
+
+
        function api_register_func($path, $func, $auth=false){
                global $API;
                $API[$path] = array('func'=>$func,
                                                        'auth'=>$auth);
        }
-       
+
        /**
         * Simple HTTP Login
         */
@@ -691,24 +691,24 @@
                                'geo' => '',
                                'coordinates' => $lastwall['coord'],
                                'place' => $lastwall['location'],
-                               'contributors' => ''                                    
+                               'contributors' => ''
                        );
                }
                return  api_apply_template("user", $type, array('$user' => $user_info));
-               
+
        }
        api_register_func('api/users/show','api_users_show');
-       
+
        /**
-        * 
+        *
         * http://developer.twitter.com/doc/get/statuses/home_timeline
-        * 
+        *
         * TODO: Optional parameters
         * TODO: Add reply info
         */
        function api_statuses_home_timeline(&$a, $type){
                if (local_user()===false) return false;
-                               
+
                $user_info = api_get_user($a);
                // get last newtork messages
 
@@ -720,7 +720,7 @@
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-               
+
                $start = $page*$count;
 
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
@@ -728,7 +728,7 @@
                if ($max_id > 0)
                        $sql_extra = 'AND `item`.`id` <= '.intval($max_id);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -747,7 +747,7 @@
 
                $ret = api_format_items($r,$user_info);
 
-               
+
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
@@ -761,7 +761,7 @@
                                return($as);
                                break;
                }
-                               
+
                return  api_apply_template("timeline", $type, $data);
        }
        api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
@@ -769,7 +769,7 @@
 
        function api_statuses_public_timeline(&$a, $type){
                if (local_user()===false) return false;
-                               
+
                $user_info = api_get_user($a);
                // get last newtork messages
 
@@ -781,7 +781,7 @@
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-               
+
                $start = $page*$count;
 
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
@@ -789,7 +789,7 @@
                if ($max_id > 0)
                        $sql_extra = 'AND `item`.`id` <= '.intval($max_id);
 
-               /*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+               /*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -806,17 +806,17 @@
                        intval($since_id),
                        intval($start), intval($count)
                );*/
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-                       `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
+                       `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
                        `user`.`nickname`, `user`.`hidewall`
                        FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                        LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
                        WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-                       AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
+                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
+                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+                       AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
                        AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                        $sql_extra
                        AND `item`.`id`>%d
@@ -827,7 +827,7 @@
 
                $ret = api_format_items($r,$user_info);
 
-               
+
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
@@ -841,7 +841,7 @@
                                return($as);
                                break;
                }
-                               
+
                return  api_apply_template("timeline", $type, $data);
        }
        api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
@@ -857,11 +857,11 @@
                // params
                $id = intval($a->argv[3]);
 
-               logger('API: api_statuses_show: '.$id);         
+               logger('API: api_statuses_show: '.$id);
 
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
 
-               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+               $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                        `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                        `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                        `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -875,7 +875,7 @@
                );
 
                $ret = api_format_items($r,$user_info);
-               
+
                $data = array('$status' => $ret[0]);
                /*switch($type){
                        case "atom":
@@ -976,7 +976,7 @@
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-               
+
                $start = $page*$count;
 
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
@@ -985,11 +985,19 @@
                $myurl = substr($myurl,strpos($myurl,'://')+3);
                $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
-               $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
-                       dbesc($myurl . '$'),
-                       dbesc($myurl . '\\]'),
-                       dbesc($diasp_url . '\\]')
-               );
+
+               if (get_config('system','use_fulltext_engine'))
+                        $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
+                                dbesc(protect_sprintf($myurl)),
+                                dbesc(protect_sprintf($myurl)),
+                                dbesc(protect_sprintf($diasp_url))
+                        );
+                else
+                        $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
+                                dbesc(protect_sprintf('%' . $myurl)),
+                                dbesc(protect_sprintf('%' . $myurl . '\\]%')),
+                                dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
+                        );
 
                if ($max_id > 0)
                        $sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
@@ -1013,7 +1021,7 @@
 
                $ret = api_format_items($r,$user_info);
 
-               
+
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
@@ -1027,7 +1035,7 @@
                                return($as);
                                break;
                }
-                               
+
                return  api_apply_template("timeline", $type, $data);
        }
        api_register_func('api/statuses/mentions','api_statuses_mentions', true);
@@ -1078,14 +1086,14 @@
 
                $ret = api_format_items($r,$user_info);
 
-               
+
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                        case "rss":
                                $data = api_rss_extra($a, $data, $user_info);
                }
-                               
+
                return  api_apply_template("timeline", $type, $data);
        }
 
@@ -1094,25 +1102,25 @@
 
        function api_favorites(&$a, $type){
                if (local_user()===false) return false;
-               
+
                $user_info = api_get_user($a);
                // in friendica starred item are private
                // return favorites only for self
                logger('api_favorites: self:' . $user_info['self']);
-               
+
                if ($user_info['self']==0) {
                        $ret = array();
                } else {
-                       
-                       
+
+
                        // params
                        $count = (x($_GET,'count')?$_GET['count']:20);
                        $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
                        if ($page<0) $page=0;
-                       
+
                        $start = $page*$count;
 
-                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+                       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
                                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                                `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
                                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
@@ -1129,16 +1137,16 @@
                        );
 
                        $ret = api_format_items($r,$user_info);
-               
+
                }
-               
+
                $data = array('$statuses' => $ret);
                switch($type){
                        case "atom":
                        case "rss":
                                $data = api_rss_extra($a, $data, $user_info);
                }
-                               
+
                return  api_apply_template("timeline", $type, $data);
        }
 
@@ -1208,7 +1216,7 @@
                $as['link']['type'] = "text/html";
                return($as);
        }
-       
+
        function api_format_items($r,$user_info) {
 
                //logger('api_format_items: ' . print_r($r,true));
@@ -1223,14 +1231,14 @@
                        $status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
 
                        if ($item['parent']!=$item['id']) {
-                               $r = q("select id from item where parent=%s and id<%s order by id desc limit 1", 
+                               $r = q("select id from item where parent=%s and id<%s order by id desc limit 1",
                                        intval($item['parent']), intval($item['id']));
                                if ($r)
                                        $in_reply_to_status_id = $r[0]['id'];
                                else
                                        $in_reply_to_status_id = $item['parent'];
 
-                               $r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact 
+                               $r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact
                                        where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id));
 
                                $in_reply_to_screen_name = $r[0]['author-name'];
@@ -1251,6 +1259,9 @@
                        else
                                $statustext = trim($statustitle."\n\n".$statusbody);
 
+                       if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
+                               $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
+
                        $status = array(
                                'text'          => $statustext,
                                'truncated' => False,

diff --git a/include/config.php b/include/config.php
index 12fc9cafc99b61699fe172d635673277ff79b2fd..df1070c13c6b61ab5c476e5874c619a229a85f7c 100644 (file)
--- a/include/config.php
+++ b/include/config.php
@@ -6,7 +6,7 @@
  * Note:
  * Please do not store booleans - convert to 0/1 integer values
  * The get_?config() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.  
+ * and this could lead to subtle bugs.
  *
  * There are a few places in the code (such as the admin panel) where boolean
  * configurations need to be fixed as of 10/08/2011.
@@ -30,6 +30,9 @@ function load_config($family) {
                                $a->config[$family][$k] = $rr['v'];
                        }
                }
+       } else if ($rr['cat'] != 'config') {
+               // Negative caching
+               $a->config[$family] = "!<unset>!";
        }
 }}
 
@@ -47,6 +50,13 @@ function get_config($family, $key, $instore = false) {
        global $a;
 
        if(! $instore) {
+               // Looking if the whole family isn't set
+               if(isset($a->config[$family])) {
+                       if($a->config[$family] === '!<unset>!') {
+                               return false;
+                       }
+               }
+
                if(isset($a->config[$family][$key])) {
                        if($a->config[$family][$key] === '!<unset>!') {
                                return false;
@@ -87,11 +97,11 @@ function set_config($family,$key,$value) {
                        dbesc($key),
                        dbesc($dbvalue)
                );
-               if($ret) 
+               if($ret)
                        return $value;
                return $ret;
        }
-       
+
        $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
                dbesc($dbvalue),
                dbesc($family),
@@ -118,6 +128,9 @@ function load_pconfig($uid,$family) {
                        $k = $rr['k'];
                        $a->config[$uid][$family][$k] = $rr['v'];
                }
+       } else if ($rr['cat'] != 'config') {
+               // Negative caching
+               $a->config[$uid][$family] = "!<unset>!";
        }
 }}
 
@@ -129,6 +142,13 @@ function get_pconfig($uid,$family, $key, $instore = false) {
        global $a;
 
        if(! $instore) {
+               // Looking if the whole family isn't set
+               if(isset($a->config[$uid][$family])) {
+                       if($a->config[$uid][$family] === '!<unset>!') {
+                               return false;
+                       }
+               }
+
                if(isset($a->config[$uid][$family][$key])) {
                        if($a->config[$uid][$family][$key] === '!<unset>!') {
                                return false;

diff --git a/include/dba.php b/include/dba.php
index c9f880241ba9003d38cc2a356c90e62daeb7fc59..20c08c2dd0d2e0d39bbc49628f4dc7182214bdff 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -32,9 +32,9 @@ class dba {
                if (!(strlen($server) && strlen($user))){
                        $this->connected = false;
                        $this->db = null;
-                       return;                 
+                       return;
                }
-               
+
                if($install) {
                        if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
                                if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
@@ -71,23 +71,29 @@ class dba {
        }
 
        public function q($sql) {
-               
+
                if((! $this->db) || (! $this->connected))
                        return false;
-               
+
                $this->error = '';
 
+               if (get_config("system", "db_log") != "")
+                       @file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
+
                if($this->mysqli)
                        $result = @$this->db->query($sql);
                else
                        $result = @mysql_query($sql,$this->db);
 
+               if (get_config("system", "db_log") != "")
+                       @file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Stop '."\n", FILE_APPEND);
+
                if($this->mysqli) {
                        if($this->db->errno)
                                $this->error = $this->db->error;
                }
                elseif(mysql_errno($this->db))
-                               $this->error = mysql_error($this->db);  
+                               $this->error = mysql_error($this->db);
 
                if(strlen($this->error)) {
                        logger('dba: ' . $this->error);
@@ -107,8 +113,8 @@ class dba {
                        else
                                        $mesg = mysql_num_rows($result) . ' results' . EOL;
                        }
-    
-                       $str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg 
+
+                       $str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
                                . (($this->error) ? ' error: ' . $this->error : '')
                                . EOL;
 
@@ -146,7 +152,7 @@ class dba {
                        }
                }
 
-    
+
                if($this->debug)
                        logger('dba: ' . printable(print_r($r, true)));
                return($r);

diff --git a/mod/network.php b/mod/network.php
index fbfe2de4fd1775008adc2bc6506eef0db4b32b52..a94272a4290fac21307bb6a720ae402db89d3d4e 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -402,10 +402,22 @@ function network_content(&$a, $update = 0) {
 
        if(x($_GET,'search')) {
                $search = escape_tags($_GET['search']);
-               $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
-                       dbesc(protect_sprintf('%' . $search . '%')),
-                       dbesc(protect_sprintf('%]' . $search . '[%'))
-               );
+               if (get_config('system','use_fulltext_engine')) {
+                       if(strpos($search,'#') === 0)
+                               $sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+                                       dbesc(protect_sprintf($search))
+                               );
+                       else
+                               $sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+                                       dbesc(protect_sprintf($search)),
+                                       dbesc(protect_sprintf($search))
+                               );
+               } else {
+                       $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
+                                       dbesc(protect_sprintf('%' . $search . '%')),
+                                       dbesc(protect_sprintf('%]' . $search . '[%'))
+                       );
+               }
        }
        if(strlen($file)) {
                $sql_extra .= file_tag_file_query('item',unxmlify($file));
@@ -416,11 +428,19 @@ function network_content(&$a, $update = 0) {
                $myurl = substr($myurl,strpos($myurl,'://')+3);
                $myurl = str_replace('www.','',$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
-               $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
-                       dbesc(protect_sprintf('%' . $myurl)),
-                       dbesc(protect_sprintf('%' . $myurl . ']%')),
-                       dbesc(protect_sprintf('%' . $diasp_url . ']%'))
-               );
+               if (get_config('system','use_fulltext_engine'))
+                       $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
+                               dbesc(protect_sprintf($myurl)),
+                               dbesc(protect_sprintf($myurl)),
+                               dbesc(protect_sprintf($diasp_url))
+                       );
+               else
+                       $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
+                               dbesc(protect_sprintf('%' . $myurl)),
+                               dbesc(protect_sprintf('%' . $myurl . '\\]%')),
+                               dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
+                       );
+
        }
 
        if($update) {

diff --git a/mod/search.php b/mod/search.php
index 3e6bf68aa679c96c1aaaa3507e3c00cc261e3ae3..d4cd9d96763c7d0838fa2fc72b3e0e00b345df6a 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -71,7 +71,7 @@ function search_content(&$a) {
                notice( t('Public access denied.') . EOL);
                return;
        }
-       
+
        nav_set_selected('search');
 
        require_once("include/bbcode.php");
@@ -96,7 +96,6 @@ function search_content(&$a) {
 
        $o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
-
        if(strpos($search,'#') === 0) {
                $tag = true;
                $search = substr($search,1);
@@ -109,11 +108,17 @@ function search_content(&$a) {
        if(! $search)
                return $o;
 
-       if($tag)
-               $sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ",  dbesc('\\]' . preg_quote($search) . '\\['));
-       else
-               $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
-
+       if (get_config('system','use_fulltext_engine')) {
+               if($tag)
+                       $sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.preg_quote($search));
+               else
+                       $sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(preg_quote($search)));
+       } else {
+               if($tag)
+                       $sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ",  dbesc('\\]' . preg_quote($search) . '\\['));
+               else
+                       $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
+       }
 
 
 

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index de7e4184199f06c096b21211a34809369867f34b..83079782e87676a2aa4f5dec69d88e6a2d780128 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -18,6 +18,11 @@ $a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_
 
 //init css on network and profilepages
 $cssFile = null;
+
+// Preload config
+load_config("diabook");
+load_pconfig(local_user(), "diabook");
+
 //get statuses of boxes at right-hand-column
 $close_pages = false;
 $site_close_pages = get_config("diabook", "close_pages" );