From ba6276234f3bf1c95dcd7706f6333600268db737 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 8 Nov 2015 00:36:57 +0100
Subject: [PATCH] last patch for a bit (hopefully)

---
 _sakura/templates/misaki/global/master.tpl            | 2 +-
 _sakura/templates/misaki/settings/general.options.tpl | 2 +-
 _sakura/templates/yuuno/global/master.tpl             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_sakura/templates/misaki/global/master.tpl b/_sakura/templates/misaki/global/master.tpl
index 18e9b88..4d0d19a 100755
--- a/_sakura/templates/misaki/global/master.tpl
+++ b/_sakura/templates/misaki/global/master.tpl
@@ -112,7 +112,7 @@
                                 </ul>
                             {% endif %}
                         </li>
-                        <li><a href="{% if session.checkLogin %}{{ urls.format('USER_PROFILE', [user.id]) }}{% else %}{{ urls.format('SITE_LOGIN') }}{% endif %}"><img src="{{ sakura.contentPath }}/pixel.png" alt="{{ user.username }}" style="background-image: url('{{ urls.format('IMAGE_AVATAR', [user.user_id]) }}');" class="nav-avatar" /></a></li>
+                        <li><a href="{% if session.checkLogin %}{{ urls.format('USER_PROFILE', [user.id]) }}{% else %}{{ urls.format('SITE_LOGIN') }}{% endif %}"><img src="{{ sakura.contentPath }}/pixel.png" alt="{{ user.username }}" style="background-image: url('{{ urls.format('IMAGE_AVATAR', [user.id]) }}');" class="nav-avatar" /></a></li>
                     </ul>
                 </div>
                 <div id="content">
diff --git a/_sakura/templates/misaki/settings/general.options.tpl b/_sakura/templates/misaki/settings/general.options.tpl
index 5609b4e..bacccf2 100755
--- a/_sakura/templates/misaki/settings/general.options.tpl
+++ b/_sakura/templates/misaki/settings/general.options.tpl
@@ -12,7 +12,7 @@
                     </div>
                 </div>
                 <div style="padding: 8px 0;">
-                    <input type="{{ field.option_type }}" name="option_{{ field.option_id }}" class="inputStyling"{% if user.data.user_data.userOptions[field.option_id] %}{% if field.option_type == 'checkbox' and user.data.user_data.userOptions[field.option_id] %} checked="checked" value="option_{{ field.option_id }}"{% else %} value="{{ user.data.user_data.userOptions[field.option_id] }}"{% endif %}{% endif %} />
+                    <input type="{{ field.option_type }}" name="option_{{ field.option_id }}" class="inputStyling"{% if user.optionFields[field.option_id] %}{% if field.option_type == 'checkbox' and user.optionFields[field.option_id] %} checked="checked" value="option_{{ field.option_id }}"{% else %} value="{{ user.optionFields[field.option_id] }}"{% endif %}{% endif %} />
                 </div>
             </div>
         {% endfor %}
diff --git a/_sakura/templates/yuuno/global/master.tpl b/_sakura/templates/yuuno/global/master.tpl
index 4b9f2b6..42ba5a2 100755
--- a/_sakura/templates/yuuno/global/master.tpl
+++ b/_sakura/templates/yuuno/global/master.tpl
@@ -187,7 +187,7 @@
             <div id="contentwrapper">
                 <div id="notifications"></div>
                 {% if php.self == '/profile.php' ? profile.userData.profileBackground : (user.checkPermission('SITE', 'CREATE_BACKGROUND') and user.optionFields.profileBackgroundSiteWide and user.userData.profileBackground) %}
-                    <div id="userBackground" style="background-image: url('{{ urls.format('IMAGE_BACKGROUND', [(php.self == '/profile.php' ? profile : user).data.user_id]) }}');"></div>
+                    <div id="userBackground" style="background-image: url('{{ urls.format('IMAGE_BACKGROUND', [(php.self == '/profile.php' ? profile : user).id]) }}');"></div>
                 {% endif %}
                 {% if not session.checkLogin and php.self != '/authenticate.php' %}
                     <form method="post" action="{{ urls.format('AUTH_ACTION') }}" id="headerLoginForm">