Index: branches/RC/core/units/reviews/reviews_event_handler.php =================================================================== diff -u -r9418 -r9475 --- branches/RC/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 9418) +++ branches/RC/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 9475) @@ -90,9 +90,9 @@ $object->addFilter('item_reviews', '%1$s.ItemId = '.$parent->GetDBField('ResourceId')); break; - case 'products': // used ? + case 'products': // used in In-Portal (Sturcture & Data -> Reviews section) $object->removeFilter('parent_filter'); // this is important -// $object->addFilter('product_reviews', '%1$s.ItemId = pr.ResourceId'); + $object->addFilter('product_reviews', 'pr.ResourceId IS NOT NULL'); break; /*case 'product': Index: branches/RC/core/units/general/inp1_parser.php =================================================================== diff -u -r8929 -r9475 --- branches/RC/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 8929) +++ branches/RC/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 9475) @@ -104,7 +104,8 @@ $lastExpire, $diffZone, $date, $nowDate, $lastExpireDate, $SearchPerformed, $TotalMessagesSent, $ado, $adminDir, $rootURL, $secureURL, $html, $timeout, $pathchar, $objTemplate, $objTopicList, $objArticleList, $objPostingList, $objCensorList, - $objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult, $application; + $objSmileys, $objPMList, $SubscribeAddress, $SubscribeError, $SubscribeResult, $application, + $FCKeditorBasePath; $pathtoroot = FULL_PATH.'/'; Index: branches/RC/admin/reviews.php =================================================================== diff -u -r8929 -r9475 --- branches/RC/admin/reviews.php (.../reviews.php) (revision 8929) +++ branches/RC/admin/reviews.php (.../reviews.php) (revision 9475) @@ -13,11 +13,11 @@ ## privileges along maximum prosecution allowed by law. ## ############################################################## -function k4getmicrotime() -{ - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); -} +function k4getmicrotime() +{ + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); +} $start = k4getmicrotime(); @@ -100,7 +100,7 @@ global $objSession; $SearchWord = $objSession->GetVariable($prefix.$postfix); if( isset($_REQUEST['SearchWord']) ) - { + { $SearchWord = $_REQUEST['SearchWord']; $objSession->SetVariable($prefix.$postfix, $SearchWord); } @@ -124,55 +124,58 @@ '.admin_language('la_SearchLabel').'  - -   - - + height="22" + >  + + - + '; } // common "Advanced View" tab php functions: end /* page header */ $charset = GetRegionalOption('Charset'); +$base_href = $application->ProcessParsedTag('m', 'Base_Ref', Array()); + print << In-portal + $base_href + END; @@ -182,7 +185,7 @@ END; @@ -209,7 +212,7 @@ if( $objConfig->Get($VarName) != $bit_combo['Bits'][$mod_name] ) { $filter = true; - break; + break; } } @@ -244,34 +247,34 @@ -
+
- + TabRow(); - + if(count($ItemTabs->Tabs)) - { + { ?>
- + $value) { $path = $pathtoroot.$value."admin/reviews.php"; @@ -283,7 +286,7 @@ } } $admin = $objConfig->Get("AdminDirectory"); - if(!strlen($admin)) $admin = "admin"; + if(!strlen($admin)) $admin = "admin"; ?>
@@ -296,7 +299,7 @@ -SetVariable("HasChanges", 0); - int_footer(); + int_footer(); ?> \ No newline at end of file Index: branches/RC/kernel/units/reviews/reviews_event_handler.php =================================================================== diff -u -r9418 -r9475 --- branches/RC/kernel/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 9418) +++ branches/RC/kernel/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 9475) @@ -90,9 +90,9 @@ $object->addFilter('item_reviews', '%1$s.ItemId = '.$parent->GetDBField('ResourceId')); break; - case 'products': // used ? + case 'products': // used in In-Portal (Sturcture & Data -> Reviews section) $object->removeFilter('parent_filter'); // this is important -// $object->addFilter('product_reviews', '%1$s.ItemId = pr.ResourceId'); + $object->addFilter('product_reviews', 'pr.ResourceId IS NOT NULL'); break; /*case 'product':