diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 744d2f2b03..2bc1e89f5c 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -3,6 +3,8 @@ use Friendica\App; use Friendica\Core\Config; +require_once 'include/contact_selectors.php'; + function follow_widget($value = "") { return replace_macros(get_markup_template('follow.tpl'), array( @@ -113,16 +115,13 @@ function networks_widget($baseurl, $selected = '') { ); $nets = array(); - if (dbm::is_result($r)) { - require_once 'include/contact_selectors.php'; - while ($rr = dba::fetch($r)) { - /// @TODO If 'network' is not there, this triggers an E_NOTICE - if ($rr['network']) { - $nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' )); - } + while ($rr = dba::fetch($r)) { + /// @TODO If 'network' is not there, this triggers an E_NOTICE + 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) { return ''; diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php index 5e17243241..1c64888247 100644 --- a/src/Core/PConfig.php +++ b/src/Core/PConfig.php @@ -43,11 +43,11 @@ class PConfig { $a->config[$uid][$family][$k] = $rr['v']; self::$in_db[$uid][$family][$k] = true; } - dba::close($r); } else if ($family != 'config') { // Negative caching $a->config[$uid][$family] = "!!"; } + dba::close($r); } /**