Merge branch 'joomla3' into develop

ivanramosnet · Nov 28, 2012 · 65c44ee · 65c44ee
2 parents 24e7475 + a906afa
commit 65c44ee
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/html/com_contact/category/default_items.php b/html/com_contact/category/default_items.php
@@ -9,7 +9,7 @@
 // no direct access
 defined('_JEXEC') or die;
 
-JHtml::core();
+JHtml::_('behavior.framework');
 
 $listOrder	= $this->escape($this->state->get('list.ordering'));
 $listDirn	= $this->escape($this->state->get('list.direction'));

diff --git a/html/com_contact/featured/default_items.php b/html/com_contact/featured/default_items.php
@@ -8,7 +8,7 @@
 
 // no direct access
 defined('_JEXEC') or die;
-JHtml::core();
+JHtml::_('behavior.framework');
 
 $listOrder	= $this->escape($this->state->get('list.ordering'));
 $listDirn	= $this->escape($this->state->get('list.direction'));

diff --git a/html/com_content/category/blog_item.php b/html/com_content/category/blog_item.php
@@ -15,7 +15,7 @@
 $canEdit	= $this->item->params->get('access-edit');
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 JHtml::_('behavior.tooltip');
-JHtml::core();
+JHtml::_('behavior.framework');
 
 ?>
 

diff --git a/html/com_content/category/default_articles.php b/html/com_content/category/default_articles.php
@@ -11,7 +11,7 @@
 
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 JHtml::_('behavior.tooltip');
-JHtml::core();
+JHtml::_('behavior.framework');
 
 // Create some shortcuts.
 $params		= &$this->item->params;

diff --git a/html/com_newsfeeds/category/default_items.php b/html/com_newsfeeds/category/default_items.php
@@ -9,7 +9,7 @@
 // no direct access
 defined('_JEXEC') or die;
 
-JHtml::core();
+JHtml::_('behavior.framework');
 
 $n			= count($this->items);
 $listOrder	= $this->escape($this->state->get('list.ordering'));

diff --git a/html/com_weblinks/category/default_items.php b/html/com_weblinks/category/default_items.php
@@ -13,7 +13,7 @@
 $params = &$this->item->params;
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 JHtml::_('behavior.tooltip');
-JHtml::core();
+JHtml::_('behavior.framework');
 
 // Get the user object.
 $user = JFactory::getUser();