Index: branches/5.2.x/units/articles/articles_event_handler.php =================================================================== diff -u -N -r14091 -r14101 --- branches/5.2.x/units/articles/articles_event_handler.php (.../articles_event_handler.php) (revision 14091) +++ branches/5.2.x/units/articles/articles_event_handler.php (.../articles_event_handler.php) (revision 14101) @@ -1,6 +1,6 @@ Application->recallObject('kXMLHelper'); /* @var $xml_helper kXMLHelper */ - $root_node =& $xml_helper->Parse($xml_data, XML_WITH_TEXT_NODES); + $root_node =& $xml_helper->Parse($xml_data, kXMLHelper::XML_WITH_TEXT_NODES); $feed_types = Array ( 'rss_2.0' => 'channel', 'atom' => 'feed', @@ -325,7 +325,7 @@ break; case 'html': - $data = unhtmlentities( $node->GetXML(true) ); // $node->firstChild->Data // $node->Data + $data = kUtil::unhtmlentities( $node->GetXML(true) ); // $node->firstChild->Data // $node->Data break; default: @@ -488,7 +488,7 @@ 'cust_RssLastExpired' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''), ); $virtual_fields = $this->Application->getUnitOption('c', 'VirtualFields'); - $virtual_fields = array_merge_recursive2($virtual_fields, $new_virtual_fields); + $virtual_fields = kUtil::array_merge_recursive($virtual_fields, $new_virtual_fields); $this->Application->setUnitOption('c', 'VirtualFields', $virtual_fields); } @@ -501,7 +501,7 @@ { parent::OnPreCreate($event); - if ($event->status == erSUCCESS) { + if ($event->status == kEvent::erSUCCESS) { $object =& $event->getObject(); $archive_days = $this->Application->ConfigValue('News_Archive');