harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #769 from pafcu/profiles

Browse Source 
Redirect /profiles to default profile when multi_profiles is off. Fixes ...
This commit is contained in:
RedMatrix 2014-12-29 09:28:47 +11:00
commit 8d144396b1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mod/profiles.php
View File

@ -156,9 +156,14 @@ function profiles_init(&$a) {
// Run profile_load() here to make sure the theme is set before
// we start loading content
if((argc() > 1) && (intval(argv(1)))) {
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'];
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
intval($id),
intval(local_user())
);
if(! count($r)) {
@ -556,9 +561,14 @@ function profiles_content(&$a) {
$profile_fields_basic = get_profile_fields_basic();
$profile_fields_advanced = get_profile_fields_advanced();
if((argc() > 1) && (intval(argv(1)))) {
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'];
$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[1]),
intval($id),
intval(local_user())
);
if(! count($r)) {