From c13c752abb47caa0a3786da89c876c3f4e94209b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 16 Aug 2019 18:34:13 +0200 Subject: [PATCH] Added the custom code ID to warning when custom code could not be correctly placed back into the code/file. Resolved gh-459 --- README.md | 2 +- admin/README.txt | 2 +- admin/helpers/compiler.php | 4 ++-- componentbuilder.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cc093056d..6d8f47c25 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 15th August, 2019 ++ *Last Build*: 16th August, 2019 + *Version*: 2.10.0 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/README.txt b/admin/README.txt index cc093056d..6d8f47c25 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -146,7 +146,7 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 15th August, 2019 ++ *Last Build*: 16th August, 2019 + *Version*: 2.10.0 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 7726a86b7..ccf5e1f2c 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -761,7 +761,7 @@ class Compiler extends Infusion // Load escaped code since the target endhash has changed $this->loadEscapedCode($file, $target, $lineBites); $this->app->enqueueMessage(JText::_('

Custom Code Warning

'), 'Warning'); - $this->app->enqueueMessage(JText::sprintf('Custom code could not be added to %s please review the file at line %s. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'Warning'); + $this->app->enqueueMessage(JText::sprintf('Custom code %s could not be added to %s please review the file after install at line %s and reposition the code, remove the comments and recompile to fix the issue. The issue could be due to a change to lines below the custom code.', '#' . $target['id'] . '', $target['path'], $target['from_line']), 'Warning'); } } else @@ -769,7 +769,7 @@ class Compiler extends Infusion // Load escaped code since the target hash has changed $this->loadEscapedCode($file, $target, $lineBites); $this->app->enqueueMessage(JText::_('

Custom Code Warning

'), 'Warning'); - $this->app->enqueueMessage(JText::sprintf('Custom code could not be added to %s please review the file at line %s. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'Warning'); + $this->app->enqueueMessage(JText::sprintf('Custom code %s could not be added to %s please review the file after install at line %s and reposition the code, remove the comments and recompile to fix the issue. The issue could be due to a change to lines above the custom code.', '#' . $target['id'] . '', $target['path'], $target['from_line']), 'Warning'); } } else diff --git a/componentbuilder.xml b/componentbuilder.xml index 0495082c1..077162ab7 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 15th August, 2019 + 16th August, 2019 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com