Page MenuHomeIn-Portal Phabricator
Files F1046474

D30.id569.diff
No OneTemporary
Actions

File Metadata

Created
Sat, Jun 28, 7:25 PM

D30.id569.diff
View Options

Index: core/kernel/db/cat_event_handler.php
===================================================================
--- core/kernel/db/cat_event_handler.php
+++ core/kernel/db/cat_event_handler.php
@@ -719,9 +719,14 @@
}
}
else {
- $object->addFilter('status_filter', '(%1$s.Status = ' . STATUS_ACTIVE . ') AND (' . TABLE_PREFIX . 'Categories.Status = ' . STATUS_ACTIVE . ')');
- if ($pending_editing) {
- // if category item uses pending editing abilities, then in no cases show pending copies on front
+ $object->addFilter('item_status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
+ $object->addFilter(
+ 'category_status_filter',
+ TABLE_PREFIX . 'Categories.Status IN (' . STATUS_ACTIVE . ', 4)'
+ );
+
+ if ( $pending_editing ) {
+ // If category item uses pending editing abilities, then in no cases show pending copies on front.
$object->addFilter('original_filter', '%1$s.OrgId = 0 OR %1$s.OrgId IS NULL');
}
}
Index: core/units/categories/categories_tag_processor.php
===================================================================
--- core/units/categories/categories_tag_processor.php
+++ core/units/categories/categories_tag_processor.php
@@ -2106,7 +2106,8 @@
}
$edit_tab_presets = $this->Application->getUnitOption($this->Prefix, 'EditTabPresets');
- $edit_tab_presets['Default'] = Array (
+ $edit_tab_presets['Default'] = array(
+ 'properties' => $edit_tab_presets['Default']['properties'],
'permissions' => $edit_tab_presets['Default']['permissions'],
);
$this->Application->setUnitOption($this->Prefix, 'EditTabPresets', $edit_tab_presets);

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server