nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop

Browse source
This commit is contained in:
Roland Häder 2016-03-04 22:53:42 +01:00
parent 5a439a31f3 b56a9bfacc
commit 08630ca6f8
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
boot.php
View file

@ -927,7 +927,7 @@ class App {
} else { } else {
$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'", $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
$common_filename); $common_filename);
if(! count($r)){ if(! is_filled_array($r)){
$this->cached_profile_image[$avatar_image] = $avatar_image; $this->cached_profile_image[$avatar_image] = $avatar_image;
} else { } else {
$this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']); $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
@ -1363,7 +1363,7 @@ function run_update_function($x) {
function check_plugins(&$a) { function check_plugins(&$a) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1"); $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
if(count($r)) if(is_filled_array($r))
$installed = $r; $installed = $r;
else else
$installed = array(); $installed = array();
@ -1691,7 +1691,7 @@ function current_theme(){
$r = q("select theme from user where uid = %d limit 1", $r = q("select theme from user where uid = %d limit 1",
intval($a->profile_uid) intval($a->profile_uid)
); );
if($r) if(is_filled_array($r))
$page_theme = $r[0]['theme']; $page_theme = $r[0]['theme'];
} }
@ -1804,7 +1804,7 @@ function feed_birthday($uid,$tz) {
intval($uid) intval($uid)
); );
if($p && count($p)) { if(is_filled_array($p)) {
$tmp_dob = substr($p[0]['dob'],5); $tmp_dob = substr($p[0]['dob'],5);
if(intval($tmp_dob)) { if(intval($tmp_dob)) {
$y = datetime_convert($tz,$tz,'now','Y'); $y = datetime_convert($tz,$tz,'now','Y');

2
index.php
View file

@ -108,7 +108,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
// we didn't loaded user data yet, but we need user language // we didn't loaded user data yet, but we need user language
$r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid'])); $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
$_SESSION['language'] = $lang; $_SESSION['language'] = $lang;
if (count($r)>0) $_SESSION['language'] = $r[0]['language']; if (is_filled_array($r)) $_SESSION['language'] = $r[0]['language'];
} }
if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {