|
|
Index: branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r6873 -r7014
--- branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 6873)
+++ branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 7014)
@@ -373,8 +373,20 @@
return $ret;
}
+ /**
+ * Parses warning block, but with style="display: none;". Used during permissions saving from AJAX
+ *
+ * @param Array $params
+ * @return string
+ */
function SaveWarning($params)
{
+ if ($this->Prefix != 'c') {
+ // don't use this method for other prefixes then Category, that use this tag processor
+ parent::SaveWarning($params);
+ return ;
+ }
+
$main_prefix = getArrayValue($params, 'main_prefix');
if ($main_prefix && $main_prefix != '$main_prefix') {
$top_prefix = $main_prefix;
Index: branches/unlabeled/unlabeled-1.4.2/core/units/admin/admin_events_handler.php
===================================================================
diff -u -r6935 -r7014
--- branches/unlabeled/unlabeled-1.4.2/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 6935)
+++ branches/unlabeled/unlabeled-1.4.2/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 7014)
@@ -22,6 +22,19 @@
$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files" OR VarName = "configs_parsed"');
}
+ /**
+ * Refreshes ThemeFiles & Theme tables by actual content on HDD
+ *
+ * @param kEvent $event
+ */
+ function OnRebuildThemes(&$event)
+ {
+ $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ /* @var $themes_helper kThemesHelper */
+
+ $themes_helper->refreshThemes();
+ }
+
function OnSaveColumns(&$event) {
$picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
/* @var $picker_helper kColumnPickerHelper */
Index: branches/unlabeled/unlabeled-1.9.2/core/units/permissions/permissions_tag_processor.php
===================================================================
diff -u -r6873 -r7014
--- branches/unlabeled/unlabeled-1.9.2/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 6873)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/permissions/permissions_tag_processor.php (.../permissions_tag_processor.php) (revision 7014)
@@ -146,6 +146,7 @@
$ret = '';
$block_params = $params;
foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
+ if (!$this->Application->prefixRegistred($module_data['Var']) || !$this->Application->getUnitOption($module_data['Var'], 'CatalogItem')) continue;
$params['item_prefix'] = $module_data['Var'];
$ret .= $this->Application->ProcessParsedTag('m', 'MyInclude', $params);
}
Index: branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r6878 -r7014
--- branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 6878)
+++ branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7014)
@@ -248,10 +248,16 @@
$object->addFilter('excepts_filter_h', $excepts_and_filter_h, HAVING_FILTER);
}
+ /**
+ * Enter description here...
+ *
+ * @param kEvent $event
+ * @return int
+ */
function GetPassedId(&$event)
{
- if ( $this->Application->IsAdmin() ) {
- return parent::getPassedID($event);
+ if ( $this->Application->IsAdmin()) {
+ return parent::getPassedID($event);
}
return $this->Application->GetVar('m_cat_id');
Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r6787 -r7014
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 6787)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js (.../toolbar.js) (revision 7014)
@@ -163,7 +163,24 @@
/* ----------- */
+function ToolBarMarkup(title, html) //extends ToolBarButton
+{
+ this.Title = title;
+ this.HTML = html;
+}
+ToolBarMarkup.prototype = new ToolBarButton;
+
+ToolBarMarkup.prototype.GetHTML = function() {
+ return this.HTML;
+}
+
+ToolBarMarkup.prototype.Init = function() { }
+ToolBarMarkup.prototype.Enable = function() { }
+ToolBarMarkup.prototype.Disable = function() { }
+
+/* ----------- */
+
function ToolBar(icon_prefix, $module)
{
this.Module = $module ? $module : 'core';