mirror of
https://github.com/friendica/friendica
synced 2025-04-27 06:30:12 +00:00
Merge branch 'rewrites/dbm_is_result' into develop
This commit is contained in:
commit
dac1dbd3e9
11 changed files with 20 additions and 19 deletions
|
@ -953,8 +953,8 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
|
|||
// in it.
|
||||
if (!$deleted AND !$dontcache) {
|
||||
|
||||
$r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
|
||||
if (count($r) == 1) {
|
||||
$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
|
||||
if ((dbm::is_result($r)) && (count($r) == 1)) {
|
||||
if ($notify)
|
||||
call_hooks('post_local_end', $r[0]);
|
||||
else
|
||||
|
@ -2227,7 +2227,7 @@ function posted_date_widget($url,$uid,$wall) {
|
|||
|
||||
$ret = list_post_dates($uid,$wall);
|
||||
|
||||
if (! count($ret))
|
||||
if (! dbm::is_result($ret))
|
||||
return $o;
|
||||
|
||||
$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue