joomla/Component-Builder
joomla/Component-Builder
39
23
Fork 11
Code Issues 83 Pull Requests Projects 4 Wiki Activity

External Code Inclution Option #228

Merged
Llewellyn merged 8 commits from staging into master 2018-02-08 12:42:02 +00:00
Conversation 3 Commits 8 Files Changed 20 +8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8b3528d0a4 - Show all commits

8
admin/helpers/compiler/a_Get.php
View File

@ -3719,6 +3719,11 @@ class Get
$this->db->insertObject('#__componentbuilder_online_code', $object); $this->db->insertObject('#__componentbuilder_online_code', $object);
} }
} }
else
{
// set notice that we could not get the code from the url
$this->app->enqueueMessage(JText::sprintf('The code from <b>%s</b> could not be added!', $urlKey), 'warning');
}
} }
// add to local bucket // add to local bucket
if (ComponentbuilderHelper::checkString($this->onlineCodeData[$urlKey])) if (ComponentbuilderHelper::checkString($this->onlineCodeData[$urlKey]))
@ -4360,6 +4365,9 @@ class Get
foreach ($bucket as $nr => &$customCode) foreach ($bucket as $nr => &$customCode)
{ {
$customCode['code'] = base64_decode($customCode['code']); $customCode['code'] = base64_decode($customCode['code']);
// always insure that the online code is loaded
$customCode['code'] = $this->setOnlineCodeData($customCode['code']);
// set the lang only if needed
if ($setLang) if ($setLang)
{ {
$customCode['code'] = $this->setLangStrings($customCode['code']); $customCode['code'] = $this->setLangStrings($customCode['code']);