aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-02-10 19:54:43 -0800
committerfriendica <info@friendica.com>2013-02-10 19:54:43 -0800
commit32d07c3df72ad12dae62f9d5f5d2a3f3c8f4ed7d (patch)
treeac287882b6079bcc0c2a69b01cae6a3dd036d5c2
parentb92cdd2a271966fb7d7bf78b100140a5c65e6fde (diff)
downloadvolse-hubzilla-32d07c3df72ad12dae62f9d5f5d2a3f3c8f4ed7d.tar.gz
volse-hubzilla-32d07c3df72ad12dae62f9d5f5d2a3f3c8f4ed7d.tar.bz2
volse-hubzilla-32d07c3df72ad12dae62f9d5f5d2a3f3c8f4ed7d.zip
fix profile selector on profile_photo page (unquoted mysql reserved word 'default')
-rw-r--r--mod/profile_photo.php6
-rw-r--r--view/theme/redbasic/css/style.css9
-rw-r--r--view/tpl/profile_photo.tpl2
-rw-r--r--view/tpl/smarty3/profile_photo.tpl2
4 files changed, 14 insertions, 5 deletions
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 560cd6b12..5e58ee093 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -257,11 +257,11 @@ function profile_photo_content(&$a) {
// go ahead as if we have just uploaded a new photo to crop
profile_photo_crop_ui_head($a, $ph);
}
-
- $profiles = q("select id, profile_name as name, is_default as default from profile where uid = %d",
+dbg(1);
+ $profiles = q("select id, profile_name as name, is_default as pdefault from profile where uid = %d",
intval(local_user())
);
-
+dbg(0);
if(! x($a->data,'imagecrop')) {
$tpl = get_markup_template('profile_photo.tpl');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2dfd85d85..7528f0a52 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3564,6 +3564,15 @@ nav a:hover {
text-decoration: none;
outline: none;
}
+
+#profiles-menu li a {
+ color: #ffffff;
+}
+
+#profiles-menu li a:hover {
+ color: #000000;
+}
+
nav ul {
margin: 0px;
padding: 0px 20px;
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 282e890c8..49323e01c 100644
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -12,7 +12,7 @@
<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">$lbl_profiles</label>
<select name="profile" id="profile-photo-profiles" class="form-input" >
{{ for $profiles as $p }}
-<option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option>
+<option value="$p.id" {{ if $p.pdefault }}selected="selected"{{ endif }}>$p.name</option>
{{ endfor }}
</select>
<div class="clear"></div>
diff --git a/view/tpl/smarty3/profile_photo.tpl b/view/tpl/smarty3/profile_photo.tpl
index dee2471cf..f13dee26e 100644
--- a/view/tpl/smarty3/profile_photo.tpl
+++ b/view/tpl/smarty3/profile_photo.tpl
@@ -17,7 +17,7 @@
<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
<select name="profile" id="profile-photo-profiles" class="form-input" >
{{foreach $profiles as $p}}
-<option value="{{$p.id}}" {{if $p.default}}selected="selected"{{/if}}>{{$p.name}}</option>
+<option value="{{$p.id}}" {{if $p.pdefault}}selected="selected"{{/if}}>{{$p.name}}</option>
{{/foreach}}
</select>
<div class="clear"></div>