Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r15012 -r15051
--- branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 15012)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 15051)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: categories_tag_processor.php 15051 2012-01-16 16:46:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1590,56 +1590,58 @@
 								<div class="top"></div>
 								<div class="bottom"></div>
 							</div>
-						</div>
+						</div>';
 
-						<div id="cms-revision-toolbar-layer"' . ($toolbar_hidden ? ' style="top: -56px;"' : '') . '>
-							<div id="cms-revision-toolbar">
-								<script type="text/javascript">
-									var a_toolbar = new ToolBar(undefined, undefined, "' . $base_url . '#MODULE#/admin_templates/img/");
-									' . $this->toolbarButton('select', 'la_ToolTip_Save', $tabs) . $this->toolbarButton('delete', 'la_ToolTip_Discard', $tabs) . $tabs . 'a_toolbar.AddButton( new ToolBarSeparator("sep1") );';
+					if ( $this->Application->ConfigValue('EnablePageContentRevisionControl') ) {
+						$edit_code .= '<div id="cms-revision-toolbar-layer"' . ($toolbar_hidden ? ' style="top: -56px;"' : '') . '>
+											<div id="cms-revision-toolbar">
+												<script type="text/javascript">
+													var a_toolbar = new ToolBar(undefined, undefined, "' . $base_url . '#MODULE#/admin_templates/img/");
+													' . $this->toolbarButton('select', 'la_ToolTip_Save', $tabs) . $this->toolbarButton('delete', 'la_ToolTip_Discard', $tabs) . $tabs . 'a_toolbar.AddButton( new ToolBarSeparator("sep1") );';
 
-					if ( $this->Application->CheckAdminPermission('CATEGORY.REVISION.MODERATE', 0) ) {
-						$edit_code .= $this->toolbarButton('approve', 'la_ToolTip_Publish', $tabs) . $this->toolbarButton('decline', 'la_ToolTip_Decline', $tabs) . $tabs . 'a_toolbar.AddButton( new ToolBarSeparator("sep2") );';
-					}
+						if ( $this->Application->CheckAdminPermission('CATEGORY.REVISION.MODERATE', 0) ) {
+							$edit_code .= $this->toolbarButton('approve', 'la_ToolTip_Publish', $tabs) . $this->toolbarButton('decline', 'la_ToolTip_Decline', $tabs) . $tabs . 'a_toolbar.AddButton( new ToolBarSeparator("sep2") );';
+						}
 
-					$edit_code .= $this->toolbarButton('preview', 'la_ToolTip_Preview', $tabs);
+						$edit_code .= $this->toolbarButton('preview', 'la_ToolTip_Preview', $tabs);
 
-					if ( $this->Application->CheckAdminPermission('CATEGORY.REVISION.HISTORY.VIEW', 0) ) {
-						$edit_code .= $this->toolbarButton('history', 'la_ToolTip_History', $tabs);
-					}
+						if ( $this->Application->CheckAdminPermission('CATEGORY.REVISION.HISTORY.VIEW', 0) ) {
+							$edit_code .= $this->toolbarButton('history', 'la_ToolTip_History', $tabs);
+						}
 
-					$edit_code .= $tabs . 'a_toolbar.Render();' . "\n";
+						$edit_code .= $tabs . 'a_toolbar.Render();' . "\n";
 
-					$revision =& $this->Application->recallObject('page-revision.current');
-					/* @var $revision kDBItem */
+						$revision =& $this->Application->recallObject('page-revision.current');
+						/* @var $revision kDBItem */
 
-					if ( !$revision->GetDBField('IsDraft') ) {
-						$edit_code .= $tabs . 'a_toolbar.DisableButton("select");' . $tabs . 'a_toolbar.DisableButton("delete");' . $tabs . 'a_toolbar.DisableButton("preview");';
-					}
+						if ( !$revision->GetDBField('IsDraft') ) {
+							$edit_code .= $tabs . 'a_toolbar.DisableButton("select");' . $tabs . 'a_toolbar.DisableButton("delete");' . $tabs . 'a_toolbar.DisableButton("preview");';
+						}
 
-					if ( $revision->GetDBField('Status') == STATUS_ACTIVE || $revision->GetDBField('IsDraft') ) {
-						$edit_code .= $tabs . 'a_toolbar.DisableButton("approve");';
-					}
+						if ( $revision->GetDBField('Status') == STATUS_ACTIVE || $revision->GetDBField('IsDraft') ) {
+							$edit_code .= $tabs . 'a_toolbar.DisableButton("approve");';
+						}
 
-					if ( $revision->GetDBField('Status') == STATUS_DISABLED || $revision->GetDBField('IsLive') || $revision->GetDBField('IsDraft') ) {
-						$edit_code .= $tabs . 'a_toolbar.DisableButton("decline");';
-					}
+						if ( $revision->GetDBField('Status') == STATUS_DISABLED || $revision->GetDBField('IsLive') || $revision->GetDBField('IsDraft') ) {
+							$edit_code .= $tabs . 'a_toolbar.DisableButton("decline");';
+						}
 
-					$publishing_tools = $this->Application->Phrase('la_btn_PublishingTools', false, true);
+						$publishing_tools = $this->Application->Phrase('la_btn_PublishingTools', false, true);
 
-					$edit_code .= substr($tabs, 0, -1) . '</script>
+						$edit_code .= substr($tabs, 0, -1) . '</script>
 
-								<div id="cms-current-revision-info">
-									<span class="revision-title"></span>
-									<div class="draft-saved"></div>
+									<div id="cms-current-revision-info">
+										<span class="revision-title"></span>
+										<div class="draft-saved"></div>
+									</div>
+
+									<a href="#" id="cms-close-toolbar"></a>
+									<div class="cms-clear"></div>
 								</div>
 
-								<a href="#" id="cms-close-toolbar"></a>
-								<div class="cms-clear"></div>
-							</div>
-
-							<a href="#" id="cms-toggle-revision-toolbar"' . ($toolbar_hidden ? '' : ' class="opened"') . '><span>' . $publishing_tools . '</span></a>
-						</div>' . "\n";
+								<a href="#" id="cms-toggle-revision-toolbar"' . ($toolbar_hidden ? '' : ' class="opened"') . '><span>' . $publishing_tools . '</span></a>
+							</div>' . "\n";
+					}
 				}
 
 				$edit_code .= '<div class="cms-section-properties-btn-container">' . $edit_btn . '<div class="cms-btn-content">';