Index: units/content/content_eh.php
===================================================================
--- units/content/content_eh.php	(revision 15165)
+++ units/content/content_eh.php	(working copy)
@@ -57,6 +57,36 @@
 		}
 
 		/**
+		 * Saves changes & changes language
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnPreSaveAndChangeLanguage(kEvent $event)
+		{
+			if ( $this->UseTempTables($event) ) {
+				parent::OnPreSaveAndChangeLanguage($event);
+
+				return;
+			}
+
+			// CUSTOM: begin
+			$event->CallSubEvent('OnSaveContentBlock');
+			$event->SetRedirectParam('opener', 's');
+			// CUSTOM: end
+
+			if ( $event->status == kEvent::erSUCCESS ) {
+				$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
+
+				$data = $this->Application->GetVar('st_id');
+
+				if ( $data ) {
+					$event->SetRedirectParam('st_id', $data);
+				}
+			}
+		}
+		/**
 		 * Performs auto-save of current content block (will create draft too)
 		 *
 		 * @param kEvent $event