Index: trunk/core/units/general/cat_event_handler.php =================================================================== diff -u -N -r8413 -r8415 --- trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 8413) +++ trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 8415) @@ -668,13 +668,13 @@ } $object->Fields['Status']['options'] = $new_options; } - elseif (!$this->Application->IsAdmin() && $object->GetDBField('Status') != 1 && $object->Prefix != 'cms') { + /*elseif (!$this->Application->IsAdmin() && $object->GetDBField('Status') != 1 && $object->Prefix != 'cms') { header('HTTP/1.0 404 Not Found'); while (ob_get_level()) { ob_end_clean(); } $this->Application->HTML = $this->Application->ParseBlock(array('name'=>$this->Application->ConfigValue('ErrorTemplate'))); $this->Application->Done(); exit(); - } + }*/ } Index: trunk/themes/default2007/platform/inc/styles.css =================================================================== diff -u -N -r8368 -r8415 --- trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8368) +++ trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8415) @@ -5,4 +5,8 @@ table.markup_table td { border: 1px solid #000000; +} + +.error { + color: #FF0000; } \ No newline at end of file Index: trunk/themes/default2007/platform/designs/default_design.tpl =================================================================== diff -u -N -r8372 -r8415 --- trunk/themes/default2007/platform/designs/default_design.tpl (.../default_design.tpl) (revision 8372) +++ trunk/themes/default2007/platform/designs/default_design.tpl (.../default_design.tpl) (revision 8415) @@ -14,25 +14,31 @@ - - +
+
+
+ + - - +
+ +
+ + - Index: trunk/core/units/general/cat_tag_processor.php =================================================================== diff -u -N -r8402 -r8415 --- trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 8402) +++ trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 8415) @@ -193,7 +193,7 @@ return $display_original && ($perm_value == 1) && $this->Application->GetVar($this->Prefix.'.original_id'); } - + /** * Checks if user have one of required permissions * @@ -208,11 +208,11 @@ $params['raise_warnings'] = 0; $object =& $this->getObject($params); /* @var $object kDBItem */ - + $params['cat_id'] = $object->isLoaded() ? $object->GetDBField('ParentPath') : $this->Application->GetVar('m_cat_id'); return $perm_helper->TagPermissionCheck($params, $this->getPrefixSpecial().'_HasPermission'); } - + /** * Creates link to current category or to module root category, when current category is home * @@ -224,14 +224,14 @@ if (!isset($params['cat_id'])) { $params['cat_id'] = $this->Application->GetVar('m_cat_id'); } - + if ($params['cat_id'] == 0) { $params['cat_id'] = $this->Application->findModule('Var', $this->Prefix, 'RootCat'); } - - return $this->Application->ProcessParsedTag('c', 'CategoryLink', $params); + + return $this->Application->ProcessParsedTag('c', 'CategoryLink', $params); } - + /** * Allows to detect if item has any additional images available * @@ -247,6 +247,20 @@ return $this->Conn->GetOne($sql) ? 1 : 0; } + /** + * Checks that item is pending + * + * @param Array $params + * @return bool + */ + function IsPending($params) + { + $object =& $this->getObject($params); + + $pending_status = Array (STATUS_PENDING, STATUS_PENDING_EDITING); + return in_array($object->GetDBField('Status'), $pending_status); + } + } ?> \ No newline at end of file
+