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

upstream fixes, revision updated, and mail autocomplete was lost after a recent change I made

Browse Source
This commit is contained in:
friendica 2012-12-08 11:59:21 -08:00
parent a65111b991
commit 2a39a5feee
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -1250,8 +1250,9 @@ function profile_load(&$a, $nickname, $profile = 0) {
$a->page['title'] = $a->profile['channel_name'] . " @ " . $a->config['sitename']; $a->page['title'] = $a->profile['channel_name'] . " @ " . $a->config['sitename'];
// FIXME
$_SESSION['theme'] = $a->profile['theme'];
$_SESSION['theme'] = $a->profile['channel_theme'];
/** /**
* load/reload current theme info * load/reload current theme info

1
mod/profiles.php
View File

@ -491,6 +491,7 @@ function profiles_content(&$a) {
'$banner' => t('Edit Profile Details'), '$banner' => t('Edit Profile Details'),
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$viewprof' => t('View this profile'), '$viewprof' => t('View this profile'),
'$profpic' => t('Change Profile Photo'),
'$cr_prof' => t('Create a new profile using these settings'), '$cr_prof' => t('Create a new profile using these settings'),
'$cl_prof' => t('Clone this profile'), '$cl_prof' => t('Clone this profile'),
'$del_prof' => t('Delete this profile'), '$del_prof' => t('Delete this profile'),

2
version.inc
View File

@ -1 +1 @@
2012-12-06.161 2012-12-07.162

1
view/tpl/profile_edit.tpl
View File

@ -4,6 +4,7 @@ $default
<div id="profile-edit-links"> <div id="profile-edit-links">
<ul> <ul>
<li><a href="profile_photo" id="profile-photo_upload-link" title="$profpic">$profpic</a></li>
<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li> <li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li> <li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
<li></li> <li></li>

6
view/tpl/prv_message.tpl
View File

@ -7,7 +7,13 @@
$parent $parent
<div id="prvmail-to-label">$to</div> <div id="prvmail-to-label">$to</div>
{{ if $showinputs }}
<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="$preid">
{{ else }}
$select $select
{{ endif }}
<div id="prvmail-subject-label">$subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />