Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 12:15:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into trinidad

Browse source
This commit is contained in:
friendica 2015-01-01 23:48:27 -08:00
commit 8b844ed978
2 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
boot.php
View file

@ -2184,3 +2184,19 @@ function get_poller_runtime() {
$t = get_config('system','lastpoll');
return relative_date($t);
}
function z_get_upload_dir() {
$upload_dir = get_config('system','uploaddir');
if(! $upload_dir)
$upload_dir = ini_get('upload_tmp_dir');
if(! $upload_dir)
$upload_dir = sys_get_temp_dir();
return $upload_dir;
}
function z_get_temp_dir() {
$temp_dir = get_config('system','tempdir');
if(! $temp_dir)
$temp_dir = sys_get_temp_dir();
return $upload_dir;
}

22
mod/profiles.php
View file

@ -11,7 +11,7 @@ function profiles_init(&$a) {
if((argc() > 2) && (argv(1) === "drop") && intval(argv(2))) {
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1",
intval($a->argv[2]),
intval(argv(2)),
intval(local_user())
);
if(! count($r)) {
@ -159,9 +159,13 @@ function profiles_init(&$a) {
if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
if(feature_enabled(local_user(),'multi_profiles'))
$id = $a->argv[1];
else
$id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
else {
$x = q("select id from profile where uid = %d and is_default = 1",
intval(local_user())
);
if($x)
$id = $x[0]['id'];
}
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($id),
intval(local_user())
@ -564,9 +568,13 @@ function profiles_content(&$a) {
if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) {
if(feature_enabled(local_user(),'multi_profiles'))
$id = $a->argv[1];
else
$id = q("select id from profile where uid = %d and is_default = 1",local_user())[0]['id'];
else {
$x = q("select id from profile where uid = %d and is_default = 1",
intval(local_user())
);
if($x)
$id = $x[0]['id'];
}
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($id),
intval(local_user())