aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-30 18:17:38 -0700
committerfriendica <info@friendica.com>2012-08-30 18:17:38 -0700
commiteac29badb2fade43dfe3fd6373ffc675858143dd (patch)
treeecf3ec6007a22a755900c46a4bc1e4862cc08d06 /include
parentf6d198ce5dcd9fe416975ff760439dfacbb83812 (diff)
downloadvolse-hubzilla-eac29badb2fade43dfe3fd6373ffc675858143dd.tar.gz
volse-hubzilla-eac29badb2fade43dfe3fd6373ffc675858143dd.tar.bz2
volse-hubzilla-eac29badb2fade43dfe3fd6373ffc675858143dd.zip
start on contacts/profiles
Diffstat (limited to 'include')
-rw-r--r--include/api.php2
-rw-r--r--include/identity.php2
-rw-r--r--include/text.php2
-rw-r--r--include/user.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/api.php b/include/api.php
index 296fba1a7..b63ae0fee 100644
--- a/include/api.php
+++ b/include/api.php
@@ -261,7 +261,7 @@
$usr = q("select * from user where uid = %d limit 1",
intval(local_user())
);
- $profile = q("select * from profile where uid = %d and `is-default` = 1 limit 1",
+ $profile = q("select * from profile where uid = %d and `is_default` = 1 limit 1",
intval(local_user())
);
diff --git a/include/identity.php b/include/identity.php
index a1bf4196b..9f262f1c0 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -101,7 +101,7 @@ function create_identity($arr) {
$newuid = $ret['entity']['entity_id'];
- $r = q("INSERT INTO `profile` ( `uid`, `profile_name`, `is-default`, `name`, `photo`, `thumb`)
+ $r = q("INSERT INTO `profile` ( `uid`, `profile_name`, `is_default`, `name`, `photo`, `thumb`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s') ",
intval($ret['entity']['entity_id']),
t('default'),
diff --git a/include/text.php b/include/text.php
index a1b718d44..0b4ed6ee6 100644
--- a/include/text.php
+++ b/include/text.php
@@ -528,7 +528,7 @@ function contact_block() {
if($shown == 0)
return;
- if((! is_array($a->profile)) || ($a->profile['hide-friends']))
+ if((! is_array($a->profile)) || ($a->profile['hide_friends']))
return $o;
$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0",
intval($a->profile['uid'])
diff --git a/include/user.php b/include/user.php
index 502384261..6514b269a 100644
--- a/include/user.php
+++ b/include/user.php
@@ -213,7 +213,7 @@ function create_user($arr) {
}
if(x($newuid) !== false) {
- $r = q("INSERT INTO `profile` ( `uid`, `profile_name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
+ $r = q("INSERT INTO `profile` ( `uid`, `profile_name`, `is_default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
intval($newuid),
t('default'),