sforkowany z mirror/friendica
commit
0abdb26507
|
@ -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 '';
|
||||
|
|
|
@ -41,7 +41,7 @@ class dbm {
|
|||
* Checks if $array is a filled array with at least one entry.
|
||||
*
|
||||
* @param $array mixed A filled array with at least one entry
|
||||
* @return Whether $array is a filled array
|
||||
* @return Whether $array is a filled array or an object with rows
|
||||
*/
|
||||
public static function is_result($array) {
|
||||
// It could be a return value from an update statement
|
||||
|
@ -50,10 +50,10 @@ class dbm {
|
|||
}
|
||||
|
||||
if (is_object($array)) {
|
||||
return true;
|
||||
return dba::num_rows($array) > 0;
|
||||
}
|
||||
|
||||
return (is_array($array) && count($array) > 0);
|
||||
return (is_array($array) && (count($array) > 0));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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] = "!<unset>!";
|
||||
}
|
||||
dba::close($r);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Ładowanie…
Reference in New Issue