diff options
author | friendica <info@friendica.com> | 2012-08-27 01:22:08 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-08-27 01:22:08 -0700 |
commit | 8c3c3d5fd7acc5df0aec9c10f8bdd89bedd2060a (patch) | |
tree | 4460c2cd50449448f25be78d543df9333ac1fe07 /mod | |
parent | 5ff6e9348b41bc87b03bafc4d9df73b383af074e (diff) | |
download | volse-hubzilla-8c3c3d5fd7acc5df0aec9c10f8bdd89bedd2060a.tar.gz volse-hubzilla-8c3c3d5fd7acc5df0aec9c10f8bdd89bedd2060a.tar.bz2 volse-hubzilla-8c3c3d5fd7acc5df0aec9c10f8bdd89bedd2060a.zip |
stuff
Diffstat (limited to 'mod')
-rw-r--r-- | mod/profile_photo.php | 2 | ||||
-rw-r--r-- | mod/profiles.php | 14 | ||||
-rw-r--r-- | mod/profperm.php | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 97e861bdd..1285bf08e 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -225,7 +225,7 @@ function profile_photo_content(&$a) { // go ahead as we have jus uploaded a new photo to crop } - $profiles = q("select `id`,`profile-name` as `name`,`is-default` as `default` from profile where uid = %d", + $profiles = q("select `id`,`profile_name` as `name`,`is-default` as `default` from profile where uid = %d", intval(local_user()) ); diff --git a/mod/profiles.php b/mod/profiles.php index 2390bc03c..db063cccb 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -213,7 +213,7 @@ function profiles_post(&$a) { } $r = q("UPDATE `profile` - SET `profile-name` = '%s', + SET `profile_name` = '%s', `name` = '%s', `pdesc` = '%s', `gender` = '%s', @@ -453,7 +453,7 @@ function profiles_content(&$a) { $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval(local_user())); - $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`) + $r2 = q("INSERT INTO `profile` (`uid` , `profile_name` , `name`, `photo`, `thumb`) VALUES ( %d, '%s', '%s', '%s', '%s' )", intval(local_user()), dbesc($name), @@ -462,7 +462,7 @@ function profiles_content(&$a) { dbesc($r1[0]['thumb']) ); - $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", + $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1", intval(local_user()), dbesc($name) ); @@ -495,7 +495,7 @@ function profiles_content(&$a) { $r1[0]['is-default'] = 0; $r1[0]['publish'] = 0; $r1[0]['net-publish'] = 0; - $r1[0]['profile-name'] = dbesc($name); + $r1[0]['profile_name'] = dbesc($name); dbesc_array($r1[0]); @@ -505,7 +505,7 @@ function profiles_content(&$a) { . implode("', '", array_values($r1[0])) . "')" ); - $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", + $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1", intval(local_user()), dbesc($name) ); @@ -614,7 +614,7 @@ function profiles_content(&$a) { '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), '$baseurl' => $a->get_baseurl(true), '$profile_id' => $r[0]['id'], - '$profile_name' => $r[0]['profile-name'], + '$profile_name' => $r[0]['profile_name'], '$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""), '$name' => $r[0]['name'], '$pdesc' => $r[0]['pdesc'], @@ -678,7 +678,7 @@ function profiles_content(&$a) { '$photo' => $a->get_cached_avatar_image($rr['thumb']), '$id' => $rr['id'], '$alt' => t('Profile Image'), - '$profile_name' => $rr['profile-name'], + '$profile_name' => $rr['profile_name'], '$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' : '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>') )); diff --git a/mod/profperm.php b/mod/profperm.php index 8d09c429c..c7ab45324 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -100,7 +100,7 @@ function profperm_content(&$a) { $o .= '<h2>' . t('Profile Visibility Editor') . '</h2>'; - $o .= '<h3>' . t('Profile') . ' \'' . $profile['profile-name'] . '\'</h3>'; + $o .= '<h3>' . t('Profile') . ' \'' . $profile['profile_name'] . '\'</h3>'; $o .= '<div id="prof-edit-desc">' . t('Click on a contact to add or remove.') . '</div>'; |