From 65e6511a3e55c2520405b9118722e479c7f5c90e Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sat, 6 Oct 2018 16:49:18 +0200 Subject: [PATCH] Little fix to insure fallback in openValidBase64 method works correctly --- README.md | 6 +++--- admin/README.txt | 6 +++--- admin/helpers/componentbuilder.php | 2 +- componentbuilder.xml | 6 +++--- componentbuilder_update_server.xml | 6 +++--- script.php | 2 +- site/helpers/componentbuilder.php | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 104fbe1c1..3f09e23ff 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.6) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.7) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -125,8 +125,8 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *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*: 4th October, 2018 -+ *Version*: 2.9.6 ++ *Last Build*: 7th October, 2018 ++ *Version*: 2.9.7 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt + *Line count*: **195701** diff --git a/admin/README.txt b/admin/README.txt index 104fbe1c1..3f09e23ff 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.6) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.7) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -125,8 +125,8 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo + *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*: 4th October, 2018 -+ *Version*: 2.9.6 ++ *Last Build*: 7th October, 2018 ++ *Version*: 2.9.7 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt + *Line count*: **195701** diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index ef034f87e..ae86abcb3 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -2295,7 +2295,7 @@ abstract class ComponentbuilderHelper } } // fallback to this, not perfect method - elseif (base64_encode(base64_decode($data, true)) === $data) + if (base64_encode(base64_decode($data, true)) === $data) { return base64_decode($data); } diff --git a/componentbuilder.xml b/componentbuilder.xml index 7d32f9cdd..c44cf475f 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,15 +1,15 @@ COM_COMPONENTBUILDER - 4th October, 2018 + 7th October, 2018 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - 2.9.6 + 2.9.7 Component Builder (v.2.9.6) +

Component Builder (v.2.9.7)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index 11c035f0c..56973fc9b 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -534,7 +534,7 @@ 2.9.4 http://www.joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.6/JCB_v2.9.6.zip + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.7/JCB_v2.9.7.zip stable @@ -548,10 +548,10 @@ Builds Complex Joomla Components com_componentbuilder component - 2.9.6 + 2.9.7 http://www.joomlacomponentbuilder.com - https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.6/JCB_v2.9.6.zip + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.7/JCB_v2.9.7.zip stable diff --git a/script.php b/script.php index 8f03cf93e..541b1678e 100644 --- a/script.php +++ b/script.php @@ -5162,7 +5162,7 @@ class com_componentbuilderInstallerScript echo ' -

Upgrade to Version 2.9.6 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.9.7 Was Successful! Let us know if anything is not working as expected.

'; } } diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index ac08137a0..abb9df196 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -2295,7 +2295,7 @@ abstract class ComponentbuilderHelper } } // fallback to this, not perfect method - elseif (base64_encode(base64_decode($data, true)) === $data) + if (base64_encode(base64_decode($data, true)) === $data) { return base64_decode($data); }