diff --git a/classes/actions/ActionLink.class.php b/classes/actions/ActionLink.class.php
index 29073811..5cf0ace9 100644
--- a/classes/actions/ActionLink.class.php
+++ b/classes/actions/ActionLink.class.php
@@ -174,9 +174,9 @@ class ActionLink extends Action {
 			$_REQUEST['topic_id']=$oTopic->getId();
 			$_REQUEST['topic_publish_index']=$oTopic->getPublishIndex();
 			$_REQUEST['topic_forbid_comment']=$oTopic->getForbidComment();
-
-			$this->Viewer_Assign('oTopic', $oTopic);
 		}
+		
+		$this->Viewer_Assign('oTopicEdit', $oTopic);
 	}
 	/**
 	 * Добавление топика-ссылки
diff --git a/classes/actions/ActionPhotoset.class.php b/classes/actions/ActionPhotoset.class.php
index 21b293e1..88ea3547 100644
--- a/classes/actions/ActionPhotoset.class.php
+++ b/classes/actions/ActionPhotoset.class.php
@@ -371,9 +371,9 @@ class ActionPhotoset extends Action {
 			$_REQUEST['topic_publish_index']=$oTopic->getPublishIndex();
 			$_REQUEST['topic_forbid_comment']=$oTopic->getForbidComment();
 			$_REQUEST['topic_main_photo']=$oTopic->getPhotosetMainPhotoId();
-
-			$this->Viewer_Assign('oTopic', $oTopic);
 		}
+
+		$this->Viewer_Assign('oTopicEdit', $oTopic);
 		$this->Viewer_Assign('aPhotos', $this->Topic_getPhotosByTopicId($oTopic->getId()));
 	}
 	/**
@@ -396,6 +396,7 @@ class ActionPhotoset extends Action {
 		 * Загружаем переменные в шаблон
 		 */
 		$this->Viewer_Assign('aBlogsAllow',$this->Blog_GetBlogsAllowByUser($this->oUserCurrent));
+		$this->Viewer_Assign('oTopic', $oTopic);
 		$this->Viewer_AddHtmlTitle($this->Lang_Get('topic_photoset_title_create'));
 
 		if (!is_numeric(getRequest('topic_id'))) {
diff --git a/classes/actions/ActionQuestion.class.php b/classes/actions/ActionQuestion.class.php
index 3eb57c05..f803fed7 100644
--- a/classes/actions/ActionQuestion.class.php
+++ b/classes/actions/ActionQuestion.class.php
@@ -151,9 +151,9 @@ class ActionQuestion extends Action {
 			foreach ($aAnswers as $aAnswer) {
 				$_REQUEST['answer'][]=$aAnswer['text'];
 			}
-
-			$this->Viewer_Assign('oTopic', $oTopic);
 		}
+
+		$this->Viewer_Assign('oTopicEdit', $oTopic);
 	}
 	/**
 	 * Добавление топика
diff --git a/classes/actions/ActionTopic.class.php b/classes/actions/ActionTopic.class.php
index 7fcd09a4..3fb477a8 100644
--- a/classes/actions/ActionTopic.class.php
+++ b/classes/actions/ActionTopic.class.php
@@ -143,9 +143,9 @@ class ActionTopic extends Action {
 			$_REQUEST['topic_id']=$oTopic->getId();
 			$_REQUEST['topic_publish_index']=$oTopic->getPublishIndex();
 			$_REQUEST['topic_forbid_comment']=$oTopic->getForbidComment();
-
-			$this->Viewer_Assign('oTopic', $oTopic);
 		}
+
+		$this->Viewer_Assign('oTopicEdit', $oTopic);
 	}
 	/**
 	 * Удаление топика
diff --git a/templates/skin/developer/actions/ActionLink/add.tpl b/templates/skin/developer/actions/ActionLink/add.tpl
index 5bedd5fc..3ee49c78 100644
--- a/templates/skin/developer/actions/ActionLink/add.tpl
+++ b/templates/skin/developer/actions/ActionLink/add.tpl
@@ -70,7 +70,7 @@
 	{hook run='form_add_topic_link_end'}
 
 	
-	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit" name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit" name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/developer/actions/ActionPhotoset/add.tpl b/templates/skin/developer/actions/ActionPhotoset/add.tpl
index 79e0998f..25c34870 100644
--- a/templates/skin/developer/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/developer/actions/ActionPhotoset/add.tpl
@@ -128,7 +128,7 @@
 	{hook run='form_add_topic_photoset_end'}
 
 
-	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit" name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit" name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/developer/actions/ActionQuestion/add.tpl b/templates/skin/developer/actions/ActionQuestion/add.tpl
index cf4c6a31..2a3b71c1 100644
--- a/templates/skin/developer/actions/ActionQuestion/add.tpl
+++ b/templates/skin/developer/actions/ActionQuestion/add.tpl
@@ -88,7 +88,7 @@
 
 	{hook run='form_add_topic_question_end'}
 
-	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit" name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit" name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/developer/actions/ActionTopic/add.tpl b/templates/skin/developer/actions/ActionTopic/add.tpl
index e48b5906..b7c9dc50 100644
--- a/templates/skin/developer/actions/ActionTopic/add.tpl
+++ b/templates/skin/developer/actions/ActionTopic/add.tpl
@@ -71,7 +71,7 @@
 	{hook run='form_add_topic_topic_end'}
 	
 	
-	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit" name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit" name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit" name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/developer/topic_preview_topic.tpl b/templates/skin/developer/topic_preview_topic.tpl
index 7157a1b4..8dd5d63c 100644
--- a/templates/skin/developer/topic_preview_topic.tpl
+++ b/templates/skin/developer/topic_preview_topic.tpl
@@ -47,6 +47,6 @@
 </article>
 
 
-<button type="submit" name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+<button type="submit" name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 <button type="submit" name="submit_preview" onclick="jQuery('#text_preview').html('').hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
 <button type="submit" name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>
\ No newline at end of file
diff --git a/templates/skin/synio/actions/ActionLink/add.tpl b/templates/skin/synio/actions/ActionLink/add.tpl
index 3ea37a3b..24a485a9 100644
--- a/templates/skin/synio/actions/ActionLink/add.tpl
+++ b/templates/skin/synio/actions/ActionLink/add.tpl
@@ -71,7 +71,7 @@
 	{hook run='form_add_topic_link_end'}
 
 	
-	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit"  name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit"  name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/synio/actions/ActionPhotoset/add.tpl b/templates/skin/synio/actions/ActionPhotoset/add.tpl
index 782901c4..e91c438f 100644
--- a/templates/skin/synio/actions/ActionPhotoset/add.tpl
+++ b/templates/skin/synio/actions/ActionPhotoset/add.tpl
@@ -127,7 +127,7 @@
 	{hook run='form_add_topic_photoset_end'}
 			
 			
-	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit"  name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit"  name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/synio/actions/ActionQuestion/add.tpl b/templates/skin/synio/actions/ActionQuestion/add.tpl
index 4669fa4b..1a43dd9a 100644
--- a/templates/skin/synio/actions/ActionQuestion/add.tpl
+++ b/templates/skin/synio/actions/ActionQuestion/add.tpl
@@ -88,7 +88,7 @@
 
 	{hook run='form_add_topic_question_end'}
 
-	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit"  name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit"  name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/synio/actions/ActionTopic/add.tpl b/templates/skin/synio/actions/ActionTopic/add.tpl
index 492e50c4..0f6a5e97 100644
--- a/templates/skin/synio/actions/ActionTopic/add.tpl
+++ b/templates/skin/synio/actions/ActionTopic/add.tpl
@@ -71,7 +71,7 @@
 	{hook run='form_add_topic_topic_end'}
 	
 	
-	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+	<button type="submit"  name="submit_topic_publish" id="submit_topic_publish" class="button button-primary fl-r">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 	<button type="submit"  name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
 	<button type="submit"  name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
 </form>
diff --git a/templates/skin/synio/topic_preview_topic.tpl b/templates/skin/synio/topic_preview_topic.tpl
index c075c50a..f5c1ea95 100644
--- a/templates/skin/synio/topic_preview_topic.tpl
+++ b/templates/skin/synio/topic_preview_topic.tpl
@@ -47,6 +47,6 @@
 </article>
 
 
-<button type="submit"  name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or $oTopic->getPublish() == 0}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
+<button type="submit"  name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{if $sEvent == 'add' or ($oTopicEdit and $oTopicEdit->getPublish() == 0)}{$aLang.topic_create_submit_publish}{else}{$aLang.topic_create_submit_update}{/if}</button>
 <button type="submit"  name="submit_preview" onclick="jQuery('#text_preview').html('').hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
 <button type="submit"  name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>
\ No newline at end of file