friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rev update

Browse source
This commit is contained in:
friendica 2012-06-16 17:29:42 -07:00
parent 217bd2a704
commit 7c2d27e275
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1375' ); define ( 'FRIENDICA_VERSION', '3.0.1376' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1149 ); define ( 'DB_UPDATE_VERSION', 1149 );

6
include/config.php
View file

@ -22,13 +22,13 @@ function load_config($family) {
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {
$k = $rr['k']; $k = $rr['k'];
if ($rr['cat'] === 'config') { if ($family === 'config') {
$a->config[$k] = $rr['v']; $a->config[$k] = $rr['v'];
} else { } else {
$a->config[$family][$k] = $rr['v']; $a->config[$family][$k] = $rr['v'];
} }
} }
} else if (isset($rr) && ($rr['cat'] != 'config')) { } else if ($family != 'config') {
// Negative caching // Negative caching
$a->config[$family] = "!<unset>!"; $a->config[$family] = "!<unset>!";
} }
@ -126,7 +126,7 @@ function load_pconfig($uid,$family) {
$k = $rr['k']; $k = $rr['k'];
$a->config[$uid][$family][$k] = $rr['v']; $a->config[$uid][$family][$k] = $rr['v'];
} }
} else if ($rr['cat'] != 'config') { } else if ($family != 'config') {
// Negative caching // Negative caching
$a->config[$uid][$family] = "!<unset>!"; $a->config[$uid][$family] = "!<unset>!";
} }

6
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1375\n" "Project-Id-Version: 3.0.1376\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -6914,7 +6914,7 @@ msgstr ""
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""
#: ../../include/onepoll.php:409 #: ../../include/onepoll.php:399
msgid "From: " msgid "From: "
msgstr "" msgstr ""