rev update

diff --git a/boot.php b/boot.php
index 01dcb6a1d04928ba7e7a17086d041767f2ff05cd..64e5ab75b192608190cdd16804ed0a3a362a0331 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1375' );
+define ( 'FRIENDICA_VERSION',      '3.0.1376' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1149      );
 

diff --git a/include/config.php b/include/config.php
index 60cd00cf6466bf606787a433ac4214e86b2af0f5..1f2a70e5a144bc4529523bd104b1428646b1c29b 100644 (file)
--- a/include/config.php
+++ b/include/config.php
@@ -22,13 +22,13 @@ function load_config($family) {
        if(count($r)) {
                foreach($r as $rr) {
                        $k = $rr['k'];
-                       if ($rr['cat'] === 'config') {
+                       if ($family === 'config') {
                                $a->config[$k] = $rr['v'];
                        } else {
                                $a->config[$family][$k] = $rr['v'];
                        }
                }
-       } else if (isset($rr) && ($rr['cat'] != 'config')) {
+       } else if ($family != 'config') {
                // Negative caching
                $a->config[$family] = "!<unset>!";
        }
@@ -126,7 +126,7 @@ function load_pconfig($uid,$family) {
                        $k = $rr['k'];
                        $a->config[$uid][$family][$k] = $rr['v'];
                }
-       } else if ($rr['cat'] != 'config') {
+       } else if ($family != 'config') {
                // Negative caching
                $a->config[$uid][$family] = "!<unset>!";
        }

diff --git a/util/messages.po b/util/messages.po
index 5a1142fbfc18735b7f52ef4b0ce84a4b22572a46..1de0fe3a3182a2a72170f3443bfe73ec6e5008c6 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1375\n"
+"Project-Id-Version: 3.0.1376\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-15 10:00-0700\n"
+"POT-Creation-Date: 2012-06-16 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6914,7 +6914,7 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/onepoll.php:409
+#: ../../include/onepoll.php:399
 msgid "From: "
 msgstr ""