Page Builder by SiteOrigin - Version 2.5.16

Version Description

  • 22 November 2017 =
  • Disabled the Content Cache feature until we've resolved all issues and conflicts.
Download this release

Release Info

Developer gpriday
Plugin Icon 128x128 Page Builder by SiteOrigin
Version 2.5.16
Comparing to
See all releases

Code changes from version 2.5.15 to 2.5.16

Files changed (11) hide show
  1. inc/cache-renderer.php +4 -139
  2. inc/live-editor.php +0 -3
  3. inc/settings.php +0 -7
  4. inc/widget-shortcode.php +0 -4
  5. js/{siteorigin-panels-2515.js → siteorigin-panels-2516.js} +0 -0
  6. js/{siteorigin-panels-2515.min.js → siteorigin-panels-2516.min.js} +0 -0
  7. js/{styling-2515.js → styling-2516.js} +0 -0
  8. js/{styling-2515.min.js → styling-2516.min.js} +0 -0
  9. lang/siteorigin-panels.pot +60 -68
  10. readme.txt +5 -2
  11. siteorigin-panels.php +11 -79
inc/cache-renderer.php CHANGED
@@ -2,17 +2,7 @@
2
 
3
  class SiteOrigin_Panels_Cache_Renderer {
4
 
5
- private $cache_render;
6
- private $cache;
7
-
8
  function __construct() {
9
- $this->cache_render = false;
10
-
11
- $this->cache = array(
12
- 'html' => array(),
13
- 'css' => array(),
14
- );
15
-
16
  // Clear cache when the Page Builder version changes
17
  add_action( 'siteorigin_panels_version_changed', array( $this, 'clear_cache' ), 10, 0 );
18
 
@@ -36,141 +26,16 @@ class SiteOrigin_Panels_Cache_Renderer {
36
  return empty( $single ) ? $single = new self() : $single;
37
  }
38
 
39
- /**
40
- * Tell the caching object that we're starting a cache
41
- *
42
- * @param $post_id
43
- */
44
- private function start_cache_render( $post_id ){
45
- $this->clear_cache( $post_id );
46
-
47
- $GLOBALS[ 'SITEORIGIN_PANELS_CACHE_RENDER' ] = true;
48
- $this->cache_render = true;
49
-
50
- $this->cache[ 'html' ][ $post_id ] = '';
51
- $this->cache[ 'css' ][ $post_id ] = '';
52
-
53
- do_action( 'siteorigin_panels_start_cache_render', $post_id );
54
- }
55
-
56
- /**
57
- * Let the caching system know that we're no longer in a cache render.
58
- */
59
- private function end_cache_render( $post_id ){
60
- unset( $GLOBALS[ 'SITEORIGIN_PANELS_CACHE_RENDER' ] );
61
- $this->cache_render = false;
62
- do_action( 'siteorigin_panels_end_cache_render', $post_id );
63
- }
64
-
65
- /**
66
- * Save the generated cache data.
67
- *
68
- * @param int $post_id
69
- */
70
- public function save( $post_id ){
71
- update_post_meta( $post_id, 'siteorigin_panels_cache', array(
72
- 'version' => SITEORIGIN_PANELS_VERSION,
73
- 'html' => SiteOrigin_Panels_Admin::double_slash_string( $this->cache[ 'html' ][ $post_id ] ),
74
- 'css' => SiteOrigin_Panels_Admin::double_slash_string( $this->cache[ 'css' ][ $post_id ] ),
75
- ) );
76
- }
77
-
78
- /**
79
- * Check if the current render being performed is for the cache.
80
- *
81
- * @return bool
82
- */
83
- public function is_cache_render( ){
84
- return $this->cache_render;
85
- }
86
-
87
- /**
88
- * @param $type
89
- * @param $content
90
- * @param $post_id
91
- * @throws Exception
92
- */
93
- public function add( $type, $content, $post_id ){
94
- if( ! $this->is_cache_render() ) {
95
- throw new Exception( 'A cache render must be started before adding HTML' );
96
- }
97
- $this->cache[ $type ][ $post_id ] .= trim( $content ) . ' ';
98
- }
99
-
100
- /**
101
- * Get a value from the cache renderer
102
- *
103
- * @param $type html or css
104
- * @param $post_id
105
- * @return mixed
106
- */
107
- public function get( $type, $post_id ){
108
- if( ! empty( $this->cache[ $type ][ $post_id ] ) ) {
109
- return $this->cache[ $type ][ $post_id ];
110
- }
111
- else {
112
- // Try get this from the meta
113
- $cache_meta = get_post_meta( $post_id, 'siteorigin_panels_cache', true );
114
- if(
115
- ! empty( $cache_meta ) &&
116
- ! empty( $cache_meta[ $type ] ) &&
117
- $cache_meta[ 'version' ] == SITEORIGIN_PANELS_VERSION
118
- ) {
119
- // This is a cache hit, so return what we need
120
- return $cache_meta[ $type ];
121
- }
122
-
123
- $this->refresh_cache( $post_id );
124
- return $this->cache[ $type ][ $post_id ];
125
- }
126
- }
127
-
128
  /**
129
  * Clear post meta cache.
130
  *
 
 
131
  * @param bool|int $post_id The ID of the post to clear or false for all
132
  */
133
  public function clear_cache( $post_id = false ){
134
  global $wpdb;
135
- if( empty( $post_id ) ) {
136
- $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_key = 'siteorigin_panels_cache'" );
137
- }
138
- else {
139
- delete_post_meta( $post_id, 'siteorigin_panels_cache' );
140
- }
141
- }
142
-
143
- /**
144
- * Refresh the stored cache for a given post
145
- *
146
- * @param $post_id
147
- * @param bool $save
148
- * @return array
149
- */
150
- private function refresh_cache( $post_id, $save = true ) {
151
- $this->start_cache_render( $post_id );
152
-
153
- if( empty( $this->cache[ 'html' ][ $post_id ] ) ) {
154
- // Generate the HTML for the post
155
- $panels_html = SiteOrigin_Panels::renderer()->render( $post_id, false );
156
- $this->add( 'html', $panels_html, $post_id );
157
- }
158
-
159
- if( empty( $this->cache[ 'css' ][ $post_id ] ) ) {
160
- // Create a single line version of the CSS
161
- $panels_css = SiteOrigin_Panels::renderer()->generate_css( $post_id );
162
- $this->add( 'css', $panels_css, $post_id );
163
- }
164
-
165
- $this->end_cache_render( $post_id );
166
-
167
- if( $save ) {
168
- $this->save( $post_id );
169
- }
170
-
171
- return array(
172
- 'html' => $this->cache[ 'html' ][ $post_id ],
173
- 'css' => $this->cache[ 'css' ][ $post_id ],
174
- );
175
  }
176
  }
2
 
3
  class SiteOrigin_Panels_Cache_Renderer {
4
 
 
 
 
5
  function __construct() {
 
 
 
 
 
 
 
6
  // Clear cache when the Page Builder version changes
7
  add_action( 'siteorigin_panels_version_changed', array( $this, 'clear_cache' ), 10, 0 );
8
 
26
  return empty( $single ) ? $single = new self() : $single;
27
  }
28
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
29
  /**
30
  * Clear post meta cache.
31
  *
32
+ * Keep this around for a bit in attempt to delete any existing caches.
33
+ *
34
  * @param bool|int $post_id The ID of the post to clear or false for all
35
  */
36
  public function clear_cache( $post_id = false ){
37
  global $wpdb;
38
+
39
+ $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_key = 'siteorigin_panels_cache'" );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
40
  }
41
  }
inc/live-editor.php CHANGED
@@ -14,9 +14,6 @@ class SiteOrigin_Panels_Live_Editor {
14
 
15
  // Don't display the admin bar when in live editor mode
16
  add_filter( 'show_admin_bar', '__return_false' );
17
-
18
- // Don't use the cached version
19
- add_filter( 'siteorigin_panels_use_cached', '__return_false' );
20
  }
21
 
22
  public static function single() {
14
 
15
  // Don't display the admin bar when in live editor mode
16
  add_filter( 'show_admin_bar', '__return_false' );
 
 
 
17
  }
18
 
19
  public static function single() {
inc/settings.php CHANGED
@@ -142,7 +142,6 @@ class SiteOrigin_Panels_Settings {
142
  // Content fields
143
  $defaults['copy-content'] = true;
144
  $defaults['copy-styles'] = false;
145
- $defaults['cache-content'] = false;
146
 
147
  return $defaults;
148
  }
@@ -417,12 +416,6 @@ class SiteOrigin_Panels_Settings {
417
  'description' => __( 'Include styles into your Post Content. This keeps page layouts, even when Page Builder is deactivated.', 'siteorigin-panels' ),
418
  );
419
 
420
- $fields['content']['fields']['cache-content'] = array(
421
- 'type' => 'checkbox',
422
- 'label' => __( 'Content Cache', 'siteorigin-panels' ),
423
- 'description' => __( "Cache CSS and HTML generated by Page Builder." , 'siteorigin-panels' ),
424
- );
425
-
426
  return $fields;
427
  }
428
 
142
  // Content fields
143
  $defaults['copy-content'] = true;
144
  $defaults['copy-styles'] = false;
 
145
 
146
  return $defaults;
147
  }
416
  'description' => __( 'Include styles into your Post Content. This keeps page layouts, even when Page Builder is deactivated.', 'siteorigin-panels' ),
417
  );
418
 
 
 
 
 
 
 
419
  return $fields;
420
  }
421
 
inc/widget-shortcode.php CHANGED
@@ -11,10 +11,6 @@ class SiteOrigin_Panels_Widget_Shortcode {
11
 
12
  static function init() {
13
  add_shortcode( 'siteorigin_widget', 'SiteOrigin_Panels_Widget_Shortcode::shortcode' );
14
-
15
- // Integration with the cache rendering system
16
- add_action( 'siteorigin_panels_start_cache_render', 'SiteOrigin_Panels_Widget_Shortcode::add_filters' );
17
- add_action( 'siteorigin_panels_end_cache_render', 'SiteOrigin_Panels_Widget_Shortcode::remove_filters' );
18
  }
19
 
20
  static function add_filters() {
11
 
12
  static function init() {
13
  add_shortcode( 'siteorigin_widget', 'SiteOrigin_Panels_Widget_Shortcode::shortcode' );
 
 
 
 
14
  }
15
 
16
  static function add_filters() {
js/{siteorigin-panels-2515.js → siteorigin-panels-2516.js} RENAMED
File without changes
js/{siteorigin-panels-2515.min.js → siteorigin-panels-2516.min.js} RENAMED
File without changes
js/{styling-2515.js → styling-2516.js} RENAMED
File without changes
js/{styling-2515.min.js → styling-2516.min.js} RENAMED
File without changes
lang/siteorigin-panels.pot CHANGED
@@ -61,7 +61,7 @@ msgstr ""
61
  msgid "WordPress Widgets"
62
  msgstr ""
63
 
64
- #: tmp/inc/admin-widget-dialog.php:183, tmp/inc/settings.php:323
65
  msgid "Recommended Widgets"
66
  msgstr ""
67
 
@@ -85,7 +85,7 @@ msgstr ""
85
  msgid "Addons"
86
  msgstr ""
87
 
88
- #: tmp/inc/admin.php:140, tmp/inc/admin.php:491, tmp/inc/admin.php:1002, tmp/inc/admin.php:1007, tmp/inc/settings.php:196, tmp/tpl/js-templates.php:203
89
  msgid "Page Builder"
90
  msgstr ""
91
 
@@ -469,231 +469,223 @@ msgstr ""
469
  msgid "Page Builder Content"
470
  msgstr ""
471
 
472
- #: tmp/inc/settings.php:196, tmp/settings/tpl/settings.php:9
473
  msgid "SiteOrigin Page Builder"
474
  msgstr ""
475
 
476
- #: tmp/inc/settings.php:223
477
  msgid "Page Builder Settings"
478
  msgstr ""
479
 
480
- #: tmp/inc/settings.php:239
481
  msgid "General"
482
  msgstr ""
483
 
484
- #: tmp/inc/settings.php:245
485
  msgid "Post Types"
486
  msgstr ""
487
 
488
- #: tmp/inc/settings.php:247
489
  msgid "The post types to use Page Builder on."
490
  msgstr ""
491
 
492
- #: tmp/inc/settings.php:252
493
  msgid "Live Editor Quick Link"
494
  msgstr ""
495
 
496
- #: tmp/inc/settings.php:253
497
  msgid "Display a Live Editor button in the admin bar."
498
  msgstr ""
499
 
500
- #: tmp/inc/settings.php:258
501
  msgid "Display Widget Count"
502
  msgstr ""
503
 
504
- #: tmp/inc/settings.php:259
505
  msgid "Display a widget count in the admin lists of posts/pages where you're using Page Builder."
506
  msgstr ""
507
 
508
- #: tmp/inc/settings.php:264
509
  msgid "Limit Parallax Motion"
510
  msgstr ""
511
 
512
- #: tmp/inc/settings.php:265
513
  msgid "How many pixels of scrolling result in a single pixel of parallax motion. 0 means automatic. Lower values give more noticeable effect."
514
  msgstr ""
515
 
516
- #: tmp/inc/settings.php:270
517
  msgid "Sidebars Emulator"
518
  msgstr ""
519
 
520
- #: tmp/inc/settings.php:271
521
  msgid "Page Builder will create an emulated sidebar, that contains all widgets in the page."
522
  msgstr ""
523
 
524
- #: tmp/inc/settings.php:276
525
  msgid "Upgrade Teaser"
526
  msgstr ""
527
 
528
- #: tmp/inc/settings.php:278
529
  msgid "Display the %sSiteOrigin Premium%s upgrade teaser in the Page Builder toolbar."
530
  msgstr ""
531
 
532
- #: tmp/inc/settings.php:286
533
  msgid "Page Builder Learning"
534
  msgstr ""
535
 
536
- #: tmp/inc/settings.php:287
537
  msgid "Display buttons for Page Builder learning."
538
  msgstr ""
539
 
540
- #: tmp/inc/settings.php:292
541
  msgid "Default To Page Builder Interface"
542
  msgstr ""
543
 
544
- #: tmp/inc/settings.php:293
545
  msgid "New posts/pages that you create will start with the Page Builder loaded."
546
  msgstr ""
547
 
548
- #: tmp/inc/settings.php:299
549
  msgid "Widgets"
550
  msgstr ""
551
 
552
- #: tmp/inc/settings.php:305
553
  msgid "Widget Title HTML"
554
  msgstr ""
555
 
556
- #: tmp/inc/settings.php:306
557
  msgid "The HTML used for widget titles. {{title}} is replaced with the widget title."
558
  msgstr ""
559
 
560
- #: tmp/inc/settings.php:311
561
  msgid "Add Widget Class"
562
  msgstr ""
563
 
564
- #: tmp/inc/settings.php:312
565
  msgid "Add the widget class to Page Builder widgets. Disable this if you're experiencing conflicts."
566
  msgstr ""
567
 
568
- #: tmp/inc/settings.php:317
569
  msgid "Legacy Bundled Widgets"
570
  msgstr ""
571
 
572
- #: tmp/inc/settings.php:318
573
  msgid "Load legacy widgets from Page Builder 1."
574
  msgstr ""
575
 
576
- #: tmp/inc/settings.php:324
577
  msgid "Display recommend widgets in Page Builder add widget dialog."
578
  msgstr ""
579
 
580
- #: tmp/inc/settings.php:330, tmp/inc/styles-admin.php:78
581
  msgid "Layout"
582
  msgstr ""
583
 
584
- #: tmp/inc/settings.php:338
585
  msgid "Responsive Layout"
586
  msgstr ""
587
 
588
- #: tmp/inc/settings.php:339
589
  msgid "Collapse widgets, rows and columns on mobile devices."
590
  msgstr ""
591
 
592
- #: tmp/inc/settings.php:344
593
  msgid "Use Tablet Layout"
594
  msgstr ""
595
 
596
- #: tmp/inc/settings.php:345
597
  msgid "Collapses columns differently on tablet devices."
598
  msgstr ""
599
 
600
- #: tmp/inc/settings.php:351
601
  msgid "Detect older browsers"
602
  msgstr ""
603
 
604
- #: tmp/inc/settings.php:352
605
  msgid "Never"
606
  msgstr ""
607
 
608
- #: tmp/inc/settings.php:353
609
  msgid "Always"
610
  msgstr ""
611
 
612
- #: tmp/inc/settings.php:355
613
  msgid "Use Legacy Layout Engine"
614
  msgstr ""
615
 
616
- #: tmp/inc/settings.php:356
617
  msgid "The CSS and HTML uses floats instead of flexbox for compatibility with very old browsers."
618
  msgstr ""
619
 
620
- #: tmp/inc/settings.php:362
621
  msgid "Tablet Width"
622
  msgstr ""
623
 
624
- #: tmp/inc/settings.php:363
625
  msgid "Device width, in pixels, to collapse into a tablet view ."
626
  msgstr ""
627
 
628
- #: tmp/inc/settings.php:369
629
  msgid "Mobile Width"
630
  msgstr ""
631
 
632
- #: tmp/inc/settings.php:370
633
  msgid "Device width, in pixels, to collapse into a mobile view ."
634
  msgstr ""
635
 
636
- #: tmp/inc/settings.php:376
637
  msgid "Row/Widget Bottom Margin"
638
  msgstr ""
639
 
640
- #: tmp/inc/settings.php:377
641
  msgid "Default margin below rows and widgets."
642
  msgstr ""
643
 
644
- #: tmp/inc/settings.php:382
645
  msgid "Last Row With Margin"
646
  msgstr ""
647
 
648
- #: tmp/inc/settings.php:383
649
  msgid "Allow margin in last row."
650
  msgstr ""
651
 
652
- #: tmp/inc/settings.php:389
653
  msgid "Row Gutter"
654
  msgstr ""
655
 
656
- #: tmp/inc/settings.php:390
657
  msgid "Default spacing between columns in each row."
658
  msgstr ""
659
 
660
- #: tmp/inc/settings.php:396
661
  msgid "Full Width Container"
662
  msgstr ""
663
 
664
- #: tmp/inc/settings.php:397
665
  msgid "The container used for the full width layout."
666
  msgstr ""
667
 
668
- #: tmp/inc/settings.php:404
669
  msgid "Content"
670
  msgstr ""
671
 
672
- #: tmp/inc/settings.php:410
673
  msgid "Copy Content"
674
  msgstr ""
675
 
676
- #: tmp/inc/settings.php:411
677
  msgid "Copy content from Page Builder to post content."
678
  msgstr ""
679
 
680
- #: tmp/inc/settings.php:416
681
  msgid "Copy Styles"
682
  msgstr ""
683
 
684
- #: tmp/inc/settings.php:417
685
  msgid "Include styles into your Post Content. This keeps page layouts, even when Page Builder is deactivated."
686
  msgstr ""
687
 
688
- #: tmp/inc/settings.php:422
689
- msgid "Content Cache"
690
- msgstr ""
691
-
692
- #: tmp/inc/settings.php:423
693
- msgid "Cache CSS and HTML generated by Page Builder."
694
- msgstr ""
695
-
696
- #: tmp/inc/settings.php:470, tmp/inc/styles-admin.php:248
697
  msgid "Enabled"
698
  msgstr ""
699
 
@@ -1129,15 +1121,15 @@ msgstr ""
1129
  msgid "Save Settings"
1130
  msgstr ""
1131
 
1132
- #: tmp/siteorigin-panels.php:313
1133
  msgid "Read More"
1134
  msgstr ""
1135
 
1136
- #: tmp/siteorigin-panels.php:433
1137
  msgid "Edit Home Page"
1138
  msgstr ""
1139
 
1140
- #: tmp/siteorigin-panels.php:453, tmp/tpl/js-templates.php:34, tmp/tpl/js-templates.php:36
1141
  msgid "Live Editor"
1142
  msgstr ""
1143
 
61
  msgid "WordPress Widgets"
62
  msgstr ""
63
 
64
+ #: tmp/inc/admin-widget-dialog.php:183, tmp/inc/settings.php:322
65
  msgid "Recommended Widgets"
66
  msgstr ""
67
 
85
  msgid "Addons"
86
  msgstr ""
87
 
88
+ #: tmp/inc/admin.php:140, tmp/inc/admin.php:491, tmp/inc/admin.php:1002, tmp/inc/admin.php:1007, tmp/inc/settings.php:195, tmp/tpl/js-templates.php:203
89
  msgid "Page Builder"
90
  msgstr ""
91
 
469
  msgid "Page Builder Content"
470
  msgstr ""
471
 
472
+ #: tmp/inc/settings.php:195, tmp/settings/tpl/settings.php:9
473
  msgid "SiteOrigin Page Builder"
474
  msgstr ""
475
 
476
+ #: tmp/inc/settings.php:222
477
  msgid "Page Builder Settings"
478
  msgstr ""
479
 
480
+ #: tmp/inc/settings.php:238
481
  msgid "General"
482
  msgstr ""
483
 
484
+ #: tmp/inc/settings.php:244
485
  msgid "Post Types"
486
  msgstr ""
487
 
488
+ #: tmp/inc/settings.php:246
489
  msgid "The post types to use Page Builder on."
490
  msgstr ""
491
 
492
+ #: tmp/inc/settings.php:251
493
  msgid "Live Editor Quick Link"
494
  msgstr ""
495
 
496
+ #: tmp/inc/settings.php:252
497
  msgid "Display a Live Editor button in the admin bar."
498
  msgstr ""
499
 
500
+ #: tmp/inc/settings.php:257
501
  msgid "Display Widget Count"
502
  msgstr ""
503
 
504
+ #: tmp/inc/settings.php:258
505
  msgid "Display a widget count in the admin lists of posts/pages where you're using Page Builder."
506
  msgstr ""
507
 
508
+ #: tmp/inc/settings.php:263
509
  msgid "Limit Parallax Motion"
510
  msgstr ""
511
 
512
+ #: tmp/inc/settings.php:264
513
  msgid "How many pixels of scrolling result in a single pixel of parallax motion. 0 means automatic. Lower values give more noticeable effect."
514
  msgstr ""
515
 
516
+ #: tmp/inc/settings.php:269
517
  msgid "Sidebars Emulator"
518
  msgstr ""
519
 
520
+ #: tmp/inc/settings.php:270
521
  msgid "Page Builder will create an emulated sidebar, that contains all widgets in the page."
522
  msgstr ""
523
 
524
+ #: tmp/inc/settings.php:275
525
  msgid "Upgrade Teaser"
526
  msgstr ""
527
 
528
+ #: tmp/inc/settings.php:277
529
  msgid "Display the %sSiteOrigin Premium%s upgrade teaser in the Page Builder toolbar."
530
  msgstr ""
531
 
532
+ #: tmp/inc/settings.php:285
533
  msgid "Page Builder Learning"
534
  msgstr ""
535
 
536
+ #: tmp/inc/settings.php:286
537
  msgid "Display buttons for Page Builder learning."
538
  msgstr ""
539
 
540
+ #: tmp/inc/settings.php:291
541
  msgid "Default To Page Builder Interface"
542
  msgstr ""
543
 
544
+ #: tmp/inc/settings.php:292
545
  msgid "New posts/pages that you create will start with the Page Builder loaded."
546
  msgstr ""
547
 
548
+ #: tmp/inc/settings.php:298
549
  msgid "Widgets"
550
  msgstr ""
551
 
552
+ #: tmp/inc/settings.php:304
553
  msgid "Widget Title HTML"
554
  msgstr ""
555
 
556
+ #: tmp/inc/settings.php:305
557
  msgid "The HTML used for widget titles. {{title}} is replaced with the widget title."
558
  msgstr ""
559
 
560
+ #: tmp/inc/settings.php:310
561
  msgid "Add Widget Class"
562
  msgstr ""
563
 
564
+ #: tmp/inc/settings.php:311
565
  msgid "Add the widget class to Page Builder widgets. Disable this if you're experiencing conflicts."
566
  msgstr ""
567
 
568
+ #: tmp/inc/settings.php:316
569
  msgid "Legacy Bundled Widgets"
570
  msgstr ""
571
 
572
+ #: tmp/inc/settings.php:317
573
  msgid "Load legacy widgets from Page Builder 1."
574
  msgstr ""
575
 
576
+ #: tmp/inc/settings.php:323
577
  msgid "Display recommend widgets in Page Builder add widget dialog."
578
  msgstr ""
579
 
580
+ #: tmp/inc/settings.php:329, tmp/inc/styles-admin.php:78
581
  msgid "Layout"
582
  msgstr ""
583
 
584
+ #: tmp/inc/settings.php:337
585
  msgid "Responsive Layout"
586
  msgstr ""
587
 
588
+ #: tmp/inc/settings.php:338
589
  msgid "Collapse widgets, rows and columns on mobile devices."
590
  msgstr ""
591
 
592
+ #: tmp/inc/settings.php:343
593
  msgid "Use Tablet Layout"
594
  msgstr ""
595
 
596
+ #: tmp/inc/settings.php:344
597
  msgid "Collapses columns differently on tablet devices."
598
  msgstr ""
599
 
600
+ #: tmp/inc/settings.php:350
601
  msgid "Detect older browsers"
602
  msgstr ""
603
 
604
+ #: tmp/inc/settings.php:351
605
  msgid "Never"
606
  msgstr ""
607
 
608
+ #: tmp/inc/settings.php:352
609
  msgid "Always"
610
  msgstr ""
611
 
612
+ #: tmp/inc/settings.php:354
613
  msgid "Use Legacy Layout Engine"
614
  msgstr ""
615
 
616
+ #: tmp/inc/settings.php:355
617
  msgid "The CSS and HTML uses floats instead of flexbox for compatibility with very old browsers."
618
  msgstr ""
619
 
620
+ #: tmp/inc/settings.php:361
621
  msgid "Tablet Width"
622
  msgstr ""
623
 
624
+ #: tmp/inc/settings.php:362
625
  msgid "Device width, in pixels, to collapse into a tablet view ."
626
  msgstr ""
627
 
628
+ #: tmp/inc/settings.php:368
629
  msgid "Mobile Width"
630
  msgstr ""
631
 
632
+ #: tmp/inc/settings.php:369
633
  msgid "Device width, in pixels, to collapse into a mobile view ."
634
  msgstr ""
635
 
636
+ #: tmp/inc/settings.php:375
637
  msgid "Row/Widget Bottom Margin"
638
  msgstr ""
639
 
640
+ #: tmp/inc/settings.php:376
641
  msgid "Default margin below rows and widgets."
642
  msgstr ""
643
 
644
+ #: tmp/inc/settings.php:381
645
  msgid "Last Row With Margin"
646
  msgstr ""
647
 
648
+ #: tmp/inc/settings.php:382
649
  msgid "Allow margin in last row."
650
  msgstr ""
651
 
652
+ #: tmp/inc/settings.php:388
653
  msgid "Row Gutter"
654
  msgstr ""
655
 
656
+ #: tmp/inc/settings.php:389
657
  msgid "Default spacing between columns in each row."
658
  msgstr ""
659
 
660
+ #: tmp/inc/settings.php:395
661
  msgid "Full Width Container"
662
  msgstr ""
663
 
664
+ #: tmp/inc/settings.php:396
665
  msgid "The container used for the full width layout."
666
  msgstr ""
667
 
668
+ #: tmp/inc/settings.php:403
669
  msgid "Content"
670
  msgstr ""
671
 
672
+ #: tmp/inc/settings.php:409
673
  msgid "Copy Content"
674
  msgstr ""
675
 
676
+ #: tmp/inc/settings.php:410
677
  msgid "Copy content from Page Builder to post content."
678
  msgstr ""
679
 
680
+ #: tmp/inc/settings.php:415
681
  msgid "Copy Styles"
682
  msgstr ""
683
 
684
+ #: tmp/inc/settings.php:416
685
  msgid "Include styles into your Post Content. This keeps page layouts, even when Page Builder is deactivated."
686
  msgstr ""
687
 
688
+ #: tmp/inc/settings.php:463, tmp/inc/styles-admin.php:248
 
 
 
 
 
 
 
 
689
  msgid "Enabled"
690
  msgstr ""
691
 
1121
  msgid "Save Settings"
1122
  msgstr ""
1123
 
1124
+ #: tmp/siteorigin-panels.php:305
1125
  msgid "Read More"
1126
  msgstr ""
1127
 
1128
+ #: tmp/siteorigin-panels.php:365
1129
  msgid "Edit Home Page"
1130
  msgstr ""
1131
 
1132
+ #: tmp/siteorigin-panels.php:385, tmp/tpl/js-templates.php:34, tmp/tpl/js-templates.php:36
1133
  msgid "Live Editor"
1134
  msgstr ""
1135
 
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Tags: page builder, responsive, widget, widgets, builder, page, admin, gallery, content, cms, pages, post, css, layout, grid
3
  Requires at least: 4.4
4
  Tested up to: 4.9
5
- Stable tag: 2.5.15
6
- Build time: 2017-11-17T17:32:34+02:00
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl.html
9
  Donate link: https://siteorigin.com/downloads/contribution/
@@ -96,6 +96,9 @@ We've tried to ensure that Page Builder is compatible with most plugin widgets.
96
 
97
  == Changelog ==
98
 
 
 
 
99
  = 2.5.15 - 17 November 2017 =
100
  * Don't use deprecated `load` event jQuery function shortcut.
101
  * Immediately switch to Page Builder if `revertToEditor` feature isn't supported.
2
  Tags: page builder, responsive, widget, widgets, builder, page, admin, gallery, content, cms, pages, post, css, layout, grid
3
  Requires at least: 4.4
4
  Tested up to: 4.9
5
+ Stable tag: 2.5.16
6
+ Build time: 2017-11-22T14:19:27+02:00
7
  License: GPLv3
8
  License URI: http://www.gnu.org/licenses/gpl.html
9
  Donate link: https://siteorigin.com/downloads/contribution/
96
 
97
  == Changelog ==
98
 
99
+ = 2.5.16 - 22 November 2017 =
100
+ * Disabled the Content Cache feature until we've resolved all issues and conflicts.
101
+
102
  = 2.5.15 - 17 November 2017 =
103
  * Don't use deprecated `load` event jQuery function shortcut.
104
  * Immediately switch to Page Builder if `revertToEditor` feature isn't supported.
siteorigin-panels.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Page Builder by SiteOrigin
4
  Plugin URI: https://siteorigin.com/page-builder/
5
  Description: A drag and drop, responsive page builder that simplifies building your website.
6
- Version: 2.5.15
7
  Author: SiteOrigin
8
  Author URI: https://siteorigin.com
9
  License: GPL3
@@ -11,11 +11,11 @@ License URI: http://www.gnu.org/licenses/gpl.html
11
  Donate link: http://siteorigin.com/page-builder/#donate
12
  */
13
 
14
- define( 'SITEORIGIN_PANELS_VERSION', '2.5.15' );
15
  if ( ! defined( 'SITEORIGIN_PANELS_JS_SUFFIX' ) ) {
16
  define( 'SITEORIGIN_PANELS_JS_SUFFIX', '.min' );
17
  }
18
- define( 'SITEORIGIN_PANELS_VERSION_SUFFIX', '-2515' );
19
 
20
  require_once plugin_dir_path( __FILE__ ) . 'inc/functions.php';
21
 
@@ -61,22 +61,14 @@ class SiteOrigin_Panels {
61
  }
62
 
63
  SiteOrigin_Panels_Widget_Shortcode::init();
64
-
65
- if(
66
- apply_filters( 'siteorigin_panels_use_cached', siteorigin_panels_setting( 'cache-content' ) ) &&
67
- ( siteorigin_panels_setting( 'legacy-layout' ) != 'auto' || ! self::is_legacy_browser() )
68
- ) {
69
- // We can use the cached content
70
- SiteOrigin_Panels_Cache_Renderer::single();
71
- add_filter( 'the_content', array( $this, 'cached_post_content' ), 1 ); // Run early to pretend to be post_content
72
- add_filter( 'wp_head', array( $this, 'cached_post_css' ) );
73
- add_filter( 'wp_enqueue_scripts', array( $this, 'cached_post_enqueue' ) );
74
- }
75
- else {
76
- // We need to generate fresh post content
77
- add_filter( 'the_content', array( $this, 'generate_post_content' ) );
78
- add_filter( 'wp_enqueue_scripts', array( $this, 'generate_post_css' ) );
79
- }
80
 
81
  define( 'SITEORIGIN_PANELS_BASE_FILE', __FILE__ );
82
  }
@@ -332,66 +324,6 @@ class SiteOrigin_Panels {
332
  $renderer->add_inline_css( get_the_ID(), $renderer->generate_css( get_the_ID() ) );
333
  }
334
  }
335
-
336
- /**
337
- * Get cached post content for the current post
338
- *
339
- * @param $content
340
- *
341
- * @return string
342
- */
343
- public function cached_post_content( $content ){
344
- if ( post_password_required( get_the_ID() ) ) {
345
- // Don't use cache for password protected
346
- return $this->generate_post_content( $content );
347
- }
348
- global $preview;
349
- if ( $preview ) {
350
- // If we're previewing a post, rather call `generate_post_content` and `generate_post_css` at the right time.
351
- add_filter( 'the_content', array( $this, 'generate_post_content' ) );
352
- add_filter( 'wp_enqueue_scripts', array( $this, 'generate_post_css' ) );
353
- return $content;
354
- }
355
-
356
- if (
357
- ! in_the_loop() ||
358
- ! apply_filters( 'siteorigin_panels_filter_content_enabled', true ) ||
359
- ! get_post_meta( get_the_ID(), 'panels_data', true )
360
- ) {
361
- return $content;
362
- }
363
-
364
- $cache = SiteOrigin_Panels_Cache_Renderer::single();
365
- $html = $cache->get( 'html', get_the_ID() );
366
-
367
- return $html;
368
- }
369
-
370
- /**
371
- * Add cached CSS for the current post
372
- */
373
- public function cached_post_css(){
374
- if( post_password_required( get_the_ID() ) ) {
375
- // Don't use cache for password protected
376
- return $this->generate_post_css();
377
- }
378
-
379
- if( is_singular() && get_post_meta( get_the_ID(), 'panels_data', true ) ) {
380
- $cache = SiteOrigin_Panels_Cache_Renderer::single();
381
- $css = $cache->get( 'css', get_the_ID() );
382
- SiteOrigin_Panels::renderer()->add_inline_css( get_the_ID(), $css );
383
- }
384
- }
385
-
386
- /**
387
- * Enqueue scripts and styles when using cache.
388
- */
389
- public function cached_post_enqueue(){
390
- wp_enqueue_style( 'siteorigin-panels-front' );
391
- wp_enqueue_script( 'siteorigin-panels-front-styles' );
392
- wp_enqueue_script( 'siteorigin-parallax' );
393
- do_action( 'siteorigin_panels_cache_enqueue' );
394
- }
395
 
396
  /**
397
  * Add all the necessary body classes.
3
  Plugin Name: Page Builder by SiteOrigin
4
  Plugin URI: https://siteorigin.com/page-builder/
5
  Description: A drag and drop, responsive page builder that simplifies building your website.
6
+ Version: 2.5.16
7
  Author: SiteOrigin
8
  Author URI: https://siteorigin.com
9
  License: GPL3
11
  Donate link: http://siteorigin.com/page-builder/#donate
12
  */
13
 
14
+ define( 'SITEORIGIN_PANELS_VERSION', '2.5.16' );
15
  if ( ! defined( 'SITEORIGIN_PANELS_JS_SUFFIX' ) ) {
16
  define( 'SITEORIGIN_PANELS_JS_SUFFIX', '.min' );
17
  }
18
+ define( 'SITEORIGIN_PANELS_VERSION_SUFFIX', '-2516' );
19
 
20
  require_once plugin_dir_path( __FILE__ ) . 'inc/functions.php';
21
 
61
  }
62
 
63
  SiteOrigin_Panels_Widget_Shortcode::init();
64
+
65
+ // We need to generate fresh post content
66
+ add_filter( 'the_content', array( $this, 'generate_post_content' ) );
67
+ add_filter( 'wp_enqueue_scripts', array( $this, 'generate_post_css' ) );
68
+
69
+ // Content cache has been removed. SiteOrigin_Panels_Cache_Renderer just deletes any existing caches.
70
+ SiteOrigin_Panels_Cache_Renderer::single();
71
+
 
 
 
 
 
 
 
 
72
 
73
  define( 'SITEORIGIN_PANELS_BASE_FILE', __FILE__ );
74
  }
324
  $renderer->add_inline_css( get_the_ID(), $renderer->generate_css( get_the_ID() ) );
325
  }
326
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
327
 
328
  /**
329
  * Add all the necessary body classes.