clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved position of "close"

This commit is contained in:
Michael 2017-08-15 10:10:09 +00:00
parent a0567d4081
commit 6c9953809a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/contact_widgets.php
View File

@ -3,6 +3,8 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
require_once 'include/contact_selectors.php';
function follow_widget($value = "") { function follow_widget($value = "") {
return replace_macros(get_markup_template('follow.tpl'), array( return replace_macros(get_markup_template('follow.tpl'), array(
@ -113,16 +115,13 @@ function networks_widget($baseurl, $selected = '') {
); );
$nets = array(); $nets = array();
if (dbm::is_result($r)) { while ($rr = dba::fetch($r)) {
require_once 'include/contact_selectors.php'; /// @TODO If 'network' is not there, this triggers an E_NOTICE
while ($rr = dba::fetch($r)) { if ($rr['network']) {
/// @TODO If 'network' is not there, this triggers an E_NOTICE $nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
if ($rr['network']) {
$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
}
} }
dba::close($r);
} }
dba::close($r);
if (count($nets) < 2) { if (count($nets) < 2) {
return ''; return '';

2
src/Core/PConfig.php
View File

@ -43,11 +43,11 @@ class PConfig {
$a->config[$uid][$family][$k] = $rr['v']; $a->config[$uid][$family][$k] = $rr['v'];
self::$in_db[$uid][$family][$k] = true; self::$in_db[$uid][$family][$k] = true;
} }
dba::close($r);
} else if ($family != 'config') { } else if ($family != 'config') {
// Negative caching // Negative caching
$a->config[$uid][$family] = "!<unset>!"; $a->config[$uid][$family] = "!<unset>!";
} }
dba::close($r);
} }
/** /**