In-Portal Issue Tracker

Index: units/categories/categories_event_handler.php
===================================================================
--- units/categories/categories_event_handler.php	(revision 15231)
+++ units/categories/categories_event_handler.php	(working copy)
@@ -1628,6 +1628,14 @@
 			}
 
 			// replace alias in form #alias_name# to actual template used in this theme
+			if ( $this->Application->isAdmin ) {
+				$themes_helper = $this->Application->recallObject('ThemesHelper');
+				/* @var $themes_helper kThemesHelper */
+
+				// only, used when in "Design Mode"
+				$this->Application->SetVar('theme.current_id', $themes_helper->getCurrentThemeId());
+			}
+
 			$theme = $this->Application->recallObject('theme.current');
 			/* @var $theme kDBItem */
 

Index: platform/elements/header.elm.tpl
===================================================================
--- platform/elements/header.elm.tpl	(revision 15246)
+++ platform/elements/header.elm.tpl	(working copy)
@@ -30,24 +30,26 @@
 						</form>
 					</td>
 
-					<!--## THEME DROP-DOWN ##-->
-					<td class="top-select-padding">
-						<form method="post" name="theme_form" id="theme_form" action="<inp2:m_FormAction />">
-							<input type="hidden" name="events[theme][OnChangeTheme]" value="" />
-							<inp2:m_Phrase label="lu_CurrentTheme"/>:
-							<select name="theme" class="input-select" onchange="document.getElementById('theme_form').submit()">
+					<inp2:m_ifnot check="m_Get" name="editing_mode">
+						<!--## THEME DROP-DOWN ##-->
+						<td class="top-select-padding">
+							<form method="post" name="theme_form" id="theme_form" action="<inp2:m_FormAction />">
+								<input type="hidden" name="events[theme][OnChangeTheme]" value="" />
+								<inp2:m_Phrase label="lu_CurrentTheme"/>:
+								<select name="theme" class="input-select" onchange="document.getElementById('theme_form').submit()">
 
-								<inp2:m_Cache key="prefix:theme;skip_var:t,page,per_page,sort_by">
-									<inp2:m_DefineElement name="theme_elem">
-										<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
-									</inp2:m_DefineElement>
+									<inp2:m_Cache key="prefix:theme;skip_var:t,page,per_page,sort_by">
+										<inp2:m_DefineElement name="theme_elem">
+											<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
+										</inp2:m_DefineElement>
 
-									<inp2:theme_PrintList render_as="theme_elem"/>
-								</inp2:m_Cache>
-							</select>
-						</form>
-					</td>
-					<!--## /THEME DROP-DOWN ##-->
+										<inp2:theme_PrintList render_as="theme_elem"/>
+									</inp2:m_Cache>
+								</select>
+							</form>
+						</td>
+						<!--## /THEME DROP-DOWN ##-->
+					</inp2:m_ifnot>
 
 					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
 						<inp2:m_Include t="in-commerce/elements/currency_picker.elm"/>