aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-12-27 12:46:59 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-12-27 12:46:59 +0100
commit754fec9a547159c38386d70a6b3e1c4b88193690 (patch)
treea91d01d02f8ce57d772ead0dbbca6a1341e1865a
parent0130fb077fbea06c0abd6e395adccddcd08a0c99 (diff)
downloadvolse-hubzilla-754fec9a547159c38386d70a6b3e1c4b88193690.tar.gz
volse-hubzilla-754fec9a547159c38386d70a6b3e1c4b88193690.tar.bz2
volse-hubzilla-754fec9a547159c38386d70a6b3e1c4b88193690.zip
Redirect /profiles to default profile when multi_profiles is off. Fixes #768
-rw-r--r--mod/profiles.php18
1 files changed, 14 insertions, 4 deletions
diff --git a/mod/profiles.php b/mod/profiles.php
index 1d784c506..f2695f332 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -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)) {