Skip to content

Commit

Permalink
fixed article loader in html helper was not using JModelLegacy
Browse files Browse the repository at this point in the history
  • Loading branch information
pollen8 committed Aug 11, 2014
1 parent a0622e6 commit 9f0699b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions components/com_fabrik/helpers/html.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ class FabrikHelperHTML
* @var array
*/
protected static $requestHeaders = null;

/**
* Usually gets set to COM_FABRIK_LIVESITE, but can be overridden by a global option
*
*
* @var string
*/
protected static $baseJSAssetURI = null;
Expand Down Expand Up @@ -1026,7 +1026,7 @@ public static function tipInt()
* Checks the js_base_url global config, to see if admin has set a base URI they want to use to
* fetch JS assets from. Allows for putting JS files in a fast CDN like Amazon. If not set,
* return COM_FABRIK_LIVESITE.
*
*
* @return string
*/
public static function getJSAssetBaseURI()
Expand All @@ -1035,18 +1035,18 @@ public static function getJSAssetBaseURI()
{
$usersConfig = JComponentHelper::getParams('com_fabrik');
$requirejsBaseURI = $usersConfig->get('requirejs_base_uri', COM_FABRIK_LIVESITE);

if (empty($requirejsBaseURI))
{
$requirejsBaseURI = COM_FABRIK_LIVESITE;
}

$requirejsBaseURI = rtrim($requirejsBaseURI, '/') . '/';
static::$baseJSAssetURI = $requirejsBaseURI;
}
return static::$baseJSAssetURI;
}

/**
* Ini the require JS configuration
* Stores the shim and config to the session, which Fabrik system plugin
Expand Down Expand Up @@ -2263,7 +2263,7 @@ public function getContentTemplate($contentTemplate, $part = 'both')
}
else
{
JModel::addIncludePath(COM_FABRIK_BASE . 'components/com_content/models');
JModelLegacy::addIncludePath(COM_FABRIK_BASE . 'components/com_content/models');
$articleModel = JModel::getInstance('Article', 'ContentModel');
$res = $articleModel->getItem($contentTemplate);
}
Expand Down

0 comments on commit 9f0699b

Please sign in to comment.