aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-16 17:29:42 -0700
committerfriendica <info@friendica.com>2012-06-16 17:29:42 -0700
commit7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687 (patch)
treecbf23264ae110e994a8b34280e1063974de8b5bc
parent217bd2a7045008cab2f025291d7c5a74bb49d918 (diff)
downloadvolse-hubzilla-7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687.tar.gz
volse-hubzilla-7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687.tar.bz2
volse-hubzilla-7c2d27e2750dc0b6cc7448f8e85b25a3c9b09687.zip
rev update
-rw-r--r--boot.php2
-rw-r--r--include/config.php6
-rw-r--r--util/messages.po6
3 files changed, 7 insertions, 7 deletions
diff --git a/boot.php b/boot.php
index 01dcb6a1d..64e5ab75b 100644
--- 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 60cd00cf6..1f2a70e5a 100644
--- 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 5a1142fbf..1de0fe3a3 100644
--- 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 ""