Index: branches/5.2.x/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 15130) +++ branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 15137) @@ -1,6 +1,6 @@ Application->recallObject('CountHelper'); + $count_helper = $this->Application->recallObject('CountHelper'); /* @var $count_helper kCountHelper */ $today_only = isset($params['today']) && $params['today']; @@ -181,7 +181,7 @@ function CategoryPath($params) { - $category_helper =& $this->Application->recallObject('CategoryHelper'); + $category_helper = $this->Application->recallObject('CategoryHelper'); /* @var $category_helper CategoryHelper */ return $category_helper->NavigationBar($params); @@ -211,7 +211,7 @@ function CurrentCategoryName($params) { - $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); + $cat_object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); /* @var $cat_object kDBList */ $sql = 'SELECT '.$this->getTitleField().' @@ -234,7 +234,7 @@ function getTitleField() { - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $ml_formatter = $this->Application->recallObject('kMultiLanguage'); /* @var $ml_formatter kMultiLanguage */ return $ml_formatter->LangFieldName('Name'); @@ -311,7 +311,7 @@ function CategoryList($params) { - //$object =& $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params ); + //$object = $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params ); $object =& $this->GetList($params); @@ -344,13 +344,13 @@ function Meta($params) { - $object =& $this->Application->recallObject($this->Prefix); // .'.-item' + $object = $this->Application->recallObject($this->Prefix); // .'.-item' /* @var $object CategoriesItem */ $meta_type = $params['name']; if ($object->isLoaded()) { // 1. get module prefix by current category - $category_helper =& $this->Application->recallObject('CategoryHelper'); + $category_helper = $this->Application->recallObject('CategoryHelper'); /* @var $category_helper CategoryHelper */ $category_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1)); @@ -372,7 +372,7 @@ if ($this->Application->GetVar('t') == $item_template) { // we are located on item's details page - $item =& $this->Application->recallObject($module_info['Var']); + $item = $this->Application->recallObject($module_info['Var']); /* @var $item kCatDBItem */ // 3. get item's meta data @@ -516,7 +516,7 @@ $continue = 1; } - $updater =& $this->Application->makeClass('kPermCacheUpdater', Array($continue)); + $updater = $this->Application->makeClass('kPermCacheUpdater', Array($continue)); /* @var $updater kPermCacheUpdater */ if ($continue === '0') { // No in dialog @@ -739,7 +739,7 @@ $cat_id = $this->Application->findModule('Name', $params['module'], 'RootCat'); } - $category =& $this->Application->recallObject($this->Prefix . '.-c' . $cat_id, $this->Prefix, Array ('skip_autoload' => true)); + $category = $this->Application->recallObject($this->Prefix . '.-c' . $cat_id, $this->Prefix, Array ('skip_autoload' => true)); /* @var $category CategoriesItem */ $category->Load($cat_id); @@ -760,7 +760,7 @@ */ function HasPermission($params) { - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $params['raise_warnings'] = 0; @@ -828,7 +828,7 @@ $format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat'; if ( preg_match("/_regional_(.*)/", $format, $regs) ) { - $lang =& $this->Application->recallObject('lang.current'); + $lang = $this->Application->recallObject('lang.current'); /* @var $lang LanguagesItem */ if ( $regs[1] == 'DateTimeFormat' ) { @@ -851,7 +851,7 @@ $params['cat_id'] = $object->GetID(); - $count_helper =& $this->Application->recallObject('CountHelper'); + $count_helper = $this->Application->recallObject('CountHelper'); /* @var $count_helper kCountHelper */ return $count_helper->CategoryItemCount($params['prefix'], $params); @@ -909,7 +909,7 @@ $parent_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1)); - $category_helper =& $this->Application->recallObject('CategoryHelper'); + $category_helper = $this->Application->recallObject('CategoryHelper'); /* @var $category_helper CategoryHelper */ $module_info = $category_helper->getCategoryModule($params, $parent_path); @@ -970,12 +970,12 @@ $app_id = $this->Application->ConfigValue('YahooApplicationId'); $url = 'http://search.yahooapis.com/WebSearchService/V1/spellingSuggestion?appid=' . $app_id . '&query='; - $curl_helper =& $this->Application->recallObject('CurlHelper'); + $curl_helper = $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ $xml_data = $curl_helper->Send( $url . urlencode($keywords) ); - $xml_helper =& $this->Application->recallObject('kXMLHelper'); + $xml_helper = $this->Application->recallObject('kXMLHelper'); /* @var $xml_helper kXMLHelper */ $root_node =& $xml_helper->Parse($xml_data); @@ -1113,7 +1113,7 @@ */ function &_getPage($params) { - $page =& $this->Application->recallObject($this->Prefix . '.-virtual', null, $params); + $page = $this->Application->recallObject($this->Prefix . '.-virtual', null, $params); /* @var $page kDBItem */ // 1. load by given id @@ -1139,7 +1139,7 @@ if (!$structure_path_match && !$design_match) { // Same sql like in "c:getPassedID". Load, when current page object doesn't match requested page object - $themes_helper =& $this->Application->recallObject('ThemesHelper'); + $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ $page_id = $themes_helper->getPageByTemplate($template); @@ -1180,10 +1180,10 @@ return ''; } - $page_helper =& $this->Application->recallObject('PageHelper'); + $page_helper = $this->Application->recallObject('PageHelper'); /* @var $page_helper PageHelper */ - $content =& $this->Application->recallObject('content.-block', null, Array ('skip_autoload' => true)); + $content = $this->Application->recallObject('content.-block', null, Array ('skip_autoload' => true)); /* @var $content kDBItem */ if ( !$page_helper->loadContentBlock($content, $page, $num) && EDITING_MODE ) { @@ -1377,7 +1377,7 @@ $this->Application->SetVar('admin_scripts_included', 1); $js_url = $this->Application->BaseURL() . 'core/admin_templates/js'; - $minify_helper =& $this->Application->recallObject('MinifyHelper'); + $minify_helper = $this->Application->recallObject('MinifyHelper'); /* @var $minify_helper MinifyHelper */ $to_compress = Array ( @@ -1433,7 +1433,7 @@ 'index_file' => 'index.php', ); - $page_helper =& $this->Application->recallObject('PageHelper'); + $page_helper = $this->Application->recallObject('PageHelper'); /* @var $page_helper PageHelper */ $class_params = Array ( @@ -1625,7 +1625,7 @@ $edit_code .= $tabs . 'a_toolbar.Render();' . "\n"; - $revision =& $this->Application->recallObject('page-revision.current'); + $revision = $this->Application->recallObject('page-revision.current'); /* @var $revision kDBItem */ if ( !$revision->GetDBField('IsDraft') ) { @@ -1717,7 +1717,7 @@ $template = $this->Application->GetVar('t'); if (!$this->Application->TemplatesCache->TemplateExists($template) && !$this->Application->isAdmin) { - $cms_handler =& $this->Application->recallObject($this->Prefix . '_EventHandler'); + $cms_handler = $this->Application->recallObject($this->Prefix . '_EventHandler'); /* @var $cms_handler CategoriesEventHandler */ $template = ltrim($cms_handler->GetDesignTemplate(), '/'); @@ -1740,7 +1740,7 @@ */ function CachedMenu($params) { - $menu_helper =& $this->Application->recallObject('MenuHelper'); + $menu_helper = $this->Application->recallObject('MenuHelper'); /* @var $menu_helper MenuHelper */ return $menu_helper->menuTag($this->getPrefixSpecial(), $params); @@ -1781,7 +1781,7 @@ */ function PrintSubPages($params) { - $list =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params); + $list = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params); /* @var $list kDBList */ $category_id = array_key_exists('category_id', $params) ? $params['category_id'] : $this->Application->GetVar('m_cat_id'); @@ -1815,10 +1815,10 @@ $object =& $this->getObject($params); /* @var $object kDBItem */ - $themes_helper =& $this->Application->recallObject('ThemesHelper'); + $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ - $site_config_helper =& $this->Application->recallObject('SiteConfigHelper'); + $site_config_helper = $this->Application->recallObject('SiteConfigHelper'); /* @var $site_config_helper SiteConfigHelper */ $settings = $site_config_helper->getSettings(); @@ -1844,7 +1844,7 @@ $object =& $this->getObject($params); /* @var $object kDBItem */ - $themes_helper =& $this->Application->recallObject('ThemesHelper'); + $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ $url_params = Array ( @@ -1964,7 +1964,7 @@ $block_params = $this->prepareTagParams($params); $block_params['name'] = $block_params['render_as']; - $object =& $this->Application->recallObject($this->Prefix); + $object = $this->Application->recallObject($this->Prefix); /* @var $object kDBItem */ $category_ids = explode('|', substr($object->GetDBField('ParentPath'), 1, -1)); @@ -2022,7 +2022,7 @@ return ''; } - $template_helper =& $this->Application->recallObject('TemplateHelper'); + $template_helper = $this->Application->recallObject('TemplateHelper'); /* @var $template_helper TemplateHelper */ return $template_helper->blockInfo( $params['name'] ); @@ -2067,7 +2067,7 @@ } } - $json_helper =& $this->Application->recallObject('JSONHelper'); + $json_helper = $this->Application->recallObject('JSONHelper'); /* @var $json_helper JSONHelper */ return $json_helper->encode($ret); @@ -2151,14 +2151,14 @@ $object =& $this->getObject($params); /* @var $object kDBItem */ - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $perm_prefix = $this->Application->getUnitOption($this->Prefix, 'PermItemPrefix'); $categories = $perm_helper->getPermissionCategories($perm_prefix . '.' . ($object->IsNewItem() ? 'ADD' : 'MODIFY')); } - $json_helper =& $this->Application->recallObject('JSONHelper'); + $json_helper = $this->Application->recallObject('JSONHelper'); /* @var $json_helper JSONHelper */ return $json_helper->encode($categories);