joomla/Component-Builder
39
25
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

fixed a line break incorrectly escaped, added better description to new fields layout

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-10-14 20:07:23 +02:00
parent 5a14049afd
commit c2972c3e17
59 changed files with 248 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
site/helpers/componentbuilder.php
View File

@ -468,11 +468,6 @@ abstract class ComponentbuilderHelper
$script['display'][] = "\t\t\t// Include helper submenu";
$script['display'][] = "\t\t\t###-#-#-Component###Helper::addSubmenu('import');";
$script['display'][] = "\t\t}";
$script['display'][] = "\n\t\t// Check for errors.";
$script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){";
$script['display'][] = "\t\t\tJError::raiseError(500, implode('<br />', \$errors));";
$script['display'][] = "\t\t\treturn false;";
$script['display'][] = "\t\t}";
$script['display'][] = "\n\t\t\$paths = new stdClass;";
$script['display'][] = "\t\t\$paths->first = '';";
$script['display'][] = "\t\t\$state = \$this->get('state');";
@ -498,6 +493,10 @@ abstract class ComponentbuilderHelper
$script['display'][] = "\t\t\t// clear the data type";
$script['display'][] = "\t\t\t\$session->clear('dataType');";
$script['display'][] = "\t\t}";
$script['display'][] = "\n\t\t// Check for errors.";
$script['display'][] = "\t\tif (count(\$errors = \$this->get('Errors'))){";
$script['display'][] = "\t\t\tthrow new Exception(implode(".'"\n", $errors), 500);';
$script['display'][] = "\t\t}";
$script['display'][] = "\n\t\t// Display the template";
$script['display'][] = "\t\tparent::display(\$tpl);";
$script['display'][] = "\t}";

3
site/views/api/view.html.php
View File

@ -55,8 +55,7 @@ class ComponentbuilderViewApi extends JViewLegacy
// Check for errors.
if (count($errors = $this->get('Errors')))
{
throw new Exception(implode("
", $errors), 500);
throw new Exception(implode("\n", $errors), 500);
}
parent::display($tpl);