Brizy – Page Builder - Version 2.0.13

Version Description

  • 2020-09-23 =
  • Fixed: Ignore old block on sync
  • Fixed: Main editor page html syntax
Download this release

Release Info

Developer themefusecom
Plugin Icon 128x128 Brizy – Page Builder
Version 2.0.13
Comparing to
See all releases

Code changes from version 2.0.12 to 2.0.13

Files changed (15) hide show
  1. README.md +5 -1
  2. admin/cloud/sync-aware.php +8 -4
  3. brizy.php +2 -3
  4. editor/synchronizable.php +3 -4
  5. jenkins/composer.sh +11 -0
  6. jenkins/git-initialize.sh +10 -0
  7. jenkins/prepare-svn.sh +51 -0
  8. jenkins/prepare-zip.sh +15 -0
  9. jenkins/version-update.sh +15 -0
  10. public/views/page.html.twig +2 -2
  11. readme.txt +5 -1
  12. vendor/autoload.php +1 -1
  13. vendor/composer/ClassLoader.php +1 -1
  14. vendor/composer/autoload_real.php +10 -7
  15. vendor/composer/autoload_static.php +4 -4
README.md CHANGED
@@ -3,7 +3,7 @@ Contributors: themefuse<br>
3
  Requires at least: 4.5<br>
4
  Tested up to: 5.5<br>
5
  Requires PHP: 5.6<br>
6
- Stable tag: 2.0.12<br>
7
  License: GPLv3<br>
8
  License URI: https://www.gnu.org/licenses/gpl-3.0.html
9
 
@@ -118,6 +118,10 @@ $bodyHtml = apply_filters( 'brizy_content', $html->get_body(), Brizy_Editor_Proj
118
 
119
  ## Changelog
120
 
 
 
 
 
121
  ### 2.0.12 - 2020-09-16 ###
122
  * Fixed: Form submission action bug
123
 
3
  Requires at least: 4.5<br>
4
  Tested up to: 5.5<br>
5
  Requires PHP: 5.6<br>
6
+ Stable tag: 2.0.13<br>
7
  License: GPLv3<br>
8
  License URI: https://www.gnu.org/licenses/gpl-3.0.html
9
 
118
 
119
  ## Changelog
120
 
121
+ ### 2.0.13 - 2020-09-23
122
+ * Fixed: Ignore old block on sync
123
+ * Fixed: Main editor page html syntax
124
+
125
  ### 2.0.12 - 2020-09-16 ###
126
  * Fixed: Form submission action bug
127
 
admin/cloud/sync-aware.php CHANGED
@@ -77,7 +77,10 @@ trait Brizy_Admin_Cloud_SyncAware {
77
 
78
  $brizyBlock = Brizy_Editor_Block::get( $blockId );
79
 
80
- if ( $brizyBlock && $brizyBlock->isSavedBlock() && !$brizyBlock->isSynchronized( $this->getClient()->getBrizyProject()->getCloudAccountId() ) ) {
 
 
 
81
  $updater = new Brizy_Admin_Cloud_BlockBridge( $this->client );
82
  $updater->export( $brizyBlock );
83
 
@@ -89,9 +92,10 @@ trait Brizy_Admin_Cloud_SyncAware {
89
  protected function syncLayout( $layoutId ) {
90
 
91
  $brizyLayout = Brizy_Editor_Layout::get( $layoutId );
92
-
93
-
94
- if ( $brizyLayout && ! $brizyLayout->isSynchronized( $this->getClient()->getBrizyProject()->getCloudAccountId() ) ) {
 
95
  $updater = new Brizy_Admin_Cloud_LayoutBridge( $this->client );
96
  $updater->export( $brizyLayout );
97
 
77
 
78
  $brizyBlock = Brizy_Editor_Block::get( $blockId );
79
 
80
+ $cloud_account_id = $this->getClient()->getBrizyProject()->getCloudAccountId();
81
+ if ( $brizyBlock &&
82
+ $brizyBlock->isSynchronizable( $cloud_account_id ) &&
83
+ !$brizyBlock->isSynchronized( $cloud_account_id ) ) {
84
  $updater = new Brizy_Admin_Cloud_BlockBridge( $this->client );
85
  $updater->export( $brizyBlock );
86
 
92
  protected function syncLayout( $layoutId ) {
93
 
94
  $brizyLayout = Brizy_Editor_Layout::get( $layoutId );
95
+ $cloud_account_id = $this->getClient()->getBrizyProject()->getCloudAccountId();
96
+ if ( $brizyLayout &&
97
+ $brizyLayout->isSynchronizable( $cloud_account_id ) &&
98
+ !$brizyLayout->isSynchronized( $cloud_account_id ) ) {
99
  $updater = new Brizy_Admin_Cloud_LayoutBridge( $this->client );
100
  $updater->export( $brizyLayout );
101
 
brizy.php CHANGED
@@ -5,7 +5,7 @@
5
  * Plugin URI: https://brizy.io/
6
  * Author: Brizy.io
7
  * Author URI: https://brizy.io/
8
- * Version: 2.0.12
9
  * Text Domain: brizy
10
  * License: GPLv3
11
  * Domain Path: /languages
@@ -19,7 +19,7 @@ if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && stripos( $_SERVER['HTTP_X_FO
19
 
20
  define( 'BRIZY_DEVELOPMENT', false );
21
  define( 'BRIZY_LOG', false );
22
- define( 'BRIZY_VERSION', '2.0.12' );
23
  define( 'BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '154-wp' );
24
  define( 'BRIZY_SYNC_VERSION', '154' );
25
  define( 'BRIZY_FILE', __FILE__ );
@@ -90,4 +90,3 @@ function brizy_clean() {
90
  }
91
 
92
  new Brizy_Compatibilities_Init();
93
-
5
  * Plugin URI: https://brizy.io/
6
  * Author: Brizy.io
7
  * Author URI: https://brizy.io/
8
+ * Version: 2.0.13
9
  * Text Domain: brizy
10
  * License: GPLv3
11
  * Domain Path: /languages
19
 
20
  define( 'BRIZY_DEVELOPMENT', false );
21
  define( 'BRIZY_LOG', false );
22
+ define( 'BRIZY_VERSION', '2.0.13' );
23
  define( 'BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '154-wp' );
24
  define( 'BRIZY_SYNC_VERSION', '154' );
25
  define( 'BRIZY_FILE', __FILE__ );
90
  }
91
 
92
  new Brizy_Compatibilities_Init();
 
editor/synchronizable.php CHANGED
@@ -156,16 +156,15 @@ trait Brizy_Editor_Synchronizable {
156
  }
157
 
158
  /**
159
- * There are old blocks that must not be synchronized
160
  *
161
- * Only block that have meta key 'brizy-cloud-update-required'
162
  *
163
  * @return bool
164
  */
165
  public function isSynchronizable( $cloudAccountId ) {
166
  if ( $this->canBeSynchronized() ) {
167
- return isset( $this->synchronizedWith[ $cloudAccountId ] );
168
- //return metadata_exists( 'post', $this->getWpPostId(), 'brizy-cloud-update-required' );
169
  }
170
 
171
  return false;
156
  }
157
 
158
  /**
159
+ * We should allow only the new versions of blocks and layouts to be syncronized
160
  *
161
+ * @param $cloudAccountId
162
  *
163
  * @return bool
164
  */
165
  public function isSynchronizable( $cloudAccountId ) {
166
  if ( $this->canBeSynchronized() ) {
167
+ return metadata_exists( 'post', $this->getWpPostId(), 'brizy-media' );
 
168
  }
169
 
170
  return false;
jenkins/composer.sh ADDED
@@ -0,0 +1,11 @@
 
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/env bash
2
+
3
+ echo -e "\Add github token in composer $1"
4
+ echo -e "-----------------------------------------------------------------------------"
5
+
6
+ # add the github token
7
+ /usr/local/bin/composer config -g github-oauth.github.com $1
8
+
9
+ echo -e "\Clear composer cache"
10
+ echo -e "-----------------------------------------------------------------------------"
11
+ /usr/local/bin/composer clearcache
jenkins/git-initialize.sh ADDED
@@ -0,0 +1,10 @@
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/env bash
2
+
3
+ # Deatached head fix.
4
+ echo -e "\nGiT Cleanup"
5
+ echo -e "-----------------------------------------------------------------------------"
6
+ git clean -fd
7
+
8
+ echo -e "\nCheckout: $1"
9
+ echo -e "-----------------------------------------------------------------------------"
10
+ git checkout -t origin/$1
jenkins/prepare-svn.sh ADDED
@@ -0,0 +1,51 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/env bash
2
+
3
+ SVN_PATH=$1
4
+ WORKSPACEE_PATH=$(pwd)
5
+
6
+ # go in svn folder
7
+ cd $SVN_PATH
8
+
9
+ echo -e "\nSVN Cleanup"
10
+ echo -e "-----------------------------------------------------------------------------"
11
+ svn cleanup && svn revert . -R && svn up
12
+ # delete the trunk content
13
+ rm -rf trunk/*
14
+ echo -e "\nCreate new trunk"
15
+ echo -e "-----------------------------------------------------------------------------"
16
+
17
+ cp -a "${WORKSPACEE_PATH}/." ./trunk/
18
+ cd trunk
19
+
20
+ echo -e "\nInstall composer dependencies"
21
+ echo -e "-----------------------------------------------------------------------------"
22
+
23
+ rm -rf vendor
24
+ /usr/local/bin/composer install --no-dev
25
+
26
+ # delete all files that are not needed in the final build
27
+ echo -e "\nDelete all dev files"
28
+ echo -e "-----------------------------------------------------------------------------"
29
+
30
+ find . -type f -name "*.dev.php" -delete
31
+ rm -rf ./public/editor-src
32
+ rm -rf ./.phpunit*
33
+ rm -rf ./.env* .idea
34
+ rm -rf ./bin ./tests *.dist *.xml *.lock *.json *.yml *.sh ./vendor/twig/twig/test
35
+ rm -rf ./vendor/twig/twig/ext/twig ./vendor/twig/twig/doc
36
+ rm -rf ./vendor/imagine/imagine/lib/Imagine/resources/Adobe/*.pdf
37
+ rm -rf ./vendor/select2/select2/docs
38
+ rm -rf ./vendor/select2/select2/tests
39
+ rm -rf ./vendor/shortpixel/shortpixel-php/test
40
+ rm -rf ./vendor/shortpixel/shortpixel-php/examples
41
+ rm -rf ./vendor/enshrined/svg-sanitize/tests/
42
+ rm -rf ./vendor/bagrinsergiu/brizy-migration-utils/tests/
43
+ ( find ./ -type d -name ".git" && find ./ -name ".gitignore" && find ./ -name ".gitmodules" && find ./vendor -name "*.md" && find ./ -name "composer.json" && find ./ -name "composer.lock" && find ./ -name ".travis.yml" && find ./ -name "phpunit.xml.dist" ) | xargs rm -rf
44
+ find . -type d -name ".git" | xargs rm -rf
45
+ find . -name ".gitignore" | xargs rm -rf
46
+ find . -name ".gitmodules" | xargs rm -rf
47
+ rm -rf ./Jenkinsfile
48
+ if svn st | grep "!" > /dev/null; then svn st | grep "!" | cut -d! -f2 | xargs svn rm; fi
49
+ if svn st | grep "?" > /dev/null; then svn st | grep "?" | cut -d? -f2 | xargs svn add; fi
50
+
51
+
jenkins/prepare-zip.sh ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/env bash
2
+
3
+ SVN_PATH=$1
4
+ ZIP_FILE_NAME=$2
5
+
6
+ # go in svn folder
7
+ cd $SVN_PATH
8
+
9
+ # create the build archive
10
+ rm -f *.zip
11
+ rm -rf brizy && mkdir brizy
12
+ cp -a ./trunk/. ./brizy/
13
+ zip -r $ZIP_FILE_NAME brizy/
14
+ rm -rf ./brizy
15
+
jenkins/version-update.sh ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/env bash
2
+
3
+ sed -i "s/Version:\s.*$/Version: $1/" "brizy.php"
4
+ sed -i "s/^Stable tag:\s.*$/Stable tag: $1/" "readme.txt"
5
+ sed -i "s/^Stable tag:\s.[^<]*/Stable tag: $1/" "README.md"
6
+ sed -i "s/'BRIZY_VERSION',\s*'.[^']*'/'BRIZY_VERSION', '$1'/" "brizy.php"
7
+ sed -i "s/'BRIZY_EDITOR_VERSION',\s'.[^']*'/'BRIZY_EDITOR_VERSION', BRIZY_DEVELOPMENT ? 'dev' : '$2' /" "brizy.php"
8
+ sed -i "s/'BRIZY_SYNC_VERSION',\s'.[^']*'/'BRIZY_SYNC_VERSION', '$3'/" "brizy.php"
9
+ sed -i "s/'BRIZY_DEVELOPMENT',.[^\)]*/'BRIZY_DEVELOPMENT', false /" "brizy.php"
10
+ sed -i "s/'BRIZY_LOG',\s.[^\)]*/'BRIZY_LOG', false /" "brizy.php"
11
+ sed -i "/== Changelog ==/r $4" readme.txt
12
+ sed -i "/## Changelog/r $5" README.md
13
+
14
+
15
+
public/views/page.html.twig CHANGED
@@ -24,8 +24,8 @@
24
  </div>
25
  <iframe id="brz-ed-iframe" class="brz-iframe brz-ed-iframe--desktop" style="border: 0; width: 100%; min-height: 100vh; margin: 0 auto;" src="{{ iframe_url }}"></iframe>
26
  {% for scriptUrl in scripts %}
27
- <script src="{{ scriptUrl }}></script>
28
  {% endfor %}
29
  </body>
30
  </html>
31
- {% endspaceless %}
24
  </div>
25
  <iframe id="brz-ed-iframe" class="brz-iframe brz-ed-iframe--desktop" style="border: 0; width: 100%; min-height: 100vh; margin: 0 auto;" src="{{ iframe_url }}"></iframe>
26
  {% for scriptUrl in scripts %}
27
+ <script src="{{ scriptUrl }}"></script>
28
  {% endfor %}
29
  </body>
30
  </html>
31
+ {% endspaceless %}
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: brizy, page builder, editor, visual editor, unyson, wysiwyg, landing page,
4
  Requires at least: 4.5
5
  Tested up to: 5.5
6
  Requires PHP: 5.6
7
- Stable tag: 2.0.12
8
  License: GPLv3
9
  License URI: https://www.gnu.org/licenses/gpl-3.0.html
10
 
@@ -139,6 +139,10 @@ The progress you're making while building your page is always backed up in the c
139
 
140
  == Changelog ==
141
 
 
 
 
 
142
  = 2.0.12 - 2020-09-16 =
143
  * Fixed: Form submission action bug
144
 
4
  Requires at least: 4.5
5
  Tested up to: 5.5
6
  Requires PHP: 5.6
7
+ Stable tag: 2.0.13
8
  License: GPLv3
9
  License URI: https://www.gnu.org/licenses/gpl-3.0.html
10
 
139
 
140
  == Changelog ==
141
 
142
+ = 2.0.13 - 2020-09-23 =
143
+ * Fixed: Ignore old block on sync
144
+ * Fixed: Main editor page html syntax
145
+
146
  = 2.0.12 - 2020-09-16 =
147
  * Fixed: Form submission action bug
148
 
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit6bef0cb0bc9eb8035ea0f3e83c146955::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit7ff4ed325aff3b398ccc6e72032e3d02::getLoader();
vendor/composer/ClassLoader.php CHANGED
@@ -60,7 +60,7 @@ class ClassLoader
60
  public function getPrefixes()
61
  {
62
  if (!empty($this->prefixesPsr0)) {
63
- return call_user_func_array('array_merge', $this->prefixesPsr0);
64
  }
65
 
66
  return array();
60
  public function getPrefixes()
61
  {
62
  if (!empty($this->prefixesPsr0)) {
63
+ return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
64
  }
65
 
66
  return array();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit6bef0cb0bc9eb8035ea0f3e83c146955
6
  {
7
  private static $loader;
8
 
@@ -13,21 +13,24 @@ class ComposerAutoloaderInit6bef0cb0bc9eb8035ea0f3e83c146955
13
  }
14
  }
15
 
 
 
 
16
  public static function getLoader()
17
  {
18
  if (null !== self::$loader) {
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit6bef0cb0bc9eb8035ea0f3e83c146955', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit6bef0cb0bc9eb8035ea0f3e83c146955', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
- call_user_func(\Composer\Autoload\ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
@@ -48,19 +51,19 @@ class ComposerAutoloaderInit6bef0cb0bc9eb8035ea0f3e83c146955
48
  $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
- $includeFiles = Composer\Autoload\ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
- composerRequire6bef0cb0bc9eb8035ea0f3e83c146955($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
- function composerRequire6bef0cb0bc9eb8035ea0f3e83c146955($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit7ff4ed325aff3b398ccc6e72032e3d02
6
  {
7
  private static $loader;
8
 
13
  }
14
  }
15
 
16
+ /**
17
+ * @return \Composer\Autoload\ClassLoader
18
+ */
19
  public static function getLoader()
20
  {
21
  if (null !== self::$loader) {
22
  return self::$loader;
23
  }
24
 
25
+ spl_autoload_register(array('ComposerAutoloaderInit7ff4ed325aff3b398ccc6e72032e3d02', 'loadClassLoader'), true, true);
26
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
27
+ spl_autoload_unregister(array('ComposerAutoloaderInit7ff4ed325aff3b398ccc6e72032e3d02', 'loadClassLoader'));
28
 
29
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
30
  if ($useStaticLoader) {
31
  require_once __DIR__ . '/autoload_static.php';
32
 
33
+ call_user_func(\Composer\Autoload\ComposerStaticInit7ff4ed325aff3b398ccc6e72032e3d02::getInitializer($loader));
34
  } else {
35
  $map = require __DIR__ . '/autoload_namespaces.php';
36
  foreach ($map as $namespace => $path) {
51
  $loader->register(true);
52
 
53
  if ($useStaticLoader) {
54
+ $includeFiles = Composer\Autoload\ComposerStaticInit7ff4ed325aff3b398ccc6e72032e3d02::$files;
55
  } else {
56
  $includeFiles = require __DIR__ . '/autoload_files.php';
57
  }
58
  foreach ($includeFiles as $fileIdentifier => $file) {
59
+ composerRequire7ff4ed325aff3b398ccc6e72032e3d02($fileIdentifier, $file);
60
  }
61
 
62
  return $loader;
63
  }
64
  }
65
 
66
+ function composerRequire7ff4ed325aff3b398ccc6e72032e3d02($fileIdentifier, $file)
67
  {
68
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
69
  require $file;
vendor/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955
8
  {
9
  public static $files = array (
10
  '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -74,9 +74,9 @@ class ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955
74
  public static function getInitializer(ClassLoader $loader)
75
  {
76
  return \Closure::bind(function () use ($loader) {
77
- $loader->prefixLengthsPsr4 = ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955::$prefixLengthsPsr4;
78
- $loader->prefixDirsPsr4 = ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955::$prefixDirsPsr4;
79
- $loader->prefixesPsr0 = ComposerStaticInit6bef0cb0bc9eb8035ea0f3e83c146955::$prefixesPsr0;
80
 
81
  }, null, ClassLoader::class);
82
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit7ff4ed325aff3b398ccc6e72032e3d02
8
  {
9
  public static $files = array (
10
  '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
74
  public static function getInitializer(ClassLoader $loader)
75
  {
76
  return \Closure::bind(function () use ($loader) {
77
+ $loader->prefixLengthsPsr4 = ComposerStaticInit7ff4ed325aff3b398ccc6e72032e3d02::$prefixLengthsPsr4;
78
+ $loader->prefixDirsPsr4 = ComposerStaticInit7ff4ed325aff3b398ccc6e72032e3d02::$prefixDirsPsr4;
79
+ $loader->prefixesPsr0 = ComposerStaticInit7ff4ed325aff3b398ccc6e72032e3d02::$prefixesPsr0;
80
 
81
  }, null, ClassLoader::class);
82
  }