All-in-One Event Calendar - Version 2.5.30

Version Description

Download this release

Release Info

Developer calvinyeh
Plugin Icon 128x128 All-in-One Event Calendar
Version 2.5.30
Comparing to
See all releases

Code changes from version 2.5.29 to 2.5.30

Files changed (26) hide show
  1. all-in-one-event-calendar.php +1 -1
  2. app/config/constants.php +1 -1
  3. app/model/settings.php +1 -1
  4. language/all-in-one-event-calendar.mo +0 -0
  5. language/all-in-one-event-calendar.po +13 -13
  6. language/all-in-one-event-calendar.pot +12 -12
  7. lib/html/element/setting/cache.php +3 -3
  8. lib/html/element/setting/calendar-page-selector.php +2 -2
  9. lib/html/element/setting/checkbox.php +3 -3
  10. lib/html/element/setting/custom.php +2 -2
  11. lib/html/element/setting/enabled-views.php +1 -1
  12. lib/html/element/setting/html.php +3 -3
  13. lib/html/element/setting/input.php +2 -2
  14. lib/html/element/setting/select.php +2 -2
  15. lib/html/element/setting/tags-categories.php +1 -1
  16. lib/html/element/setting/textarea.php +2 -2
  17. lib/twig/ai1ec-extension.php +0 -14
  18. public/admin/base_page.php +0 -2
  19. public/admin/feeds_settings.php +0 -2
  20. public/admin/settings.php +0 -2
  21. public/admin/themes-install.php +0 -1
  22. public/admin/themes-updated.php +0 -2
  23. public/admin/themes.php +0 -1
  24. public/admin/twig/base_page.twig +0 -1
  25. public/admin/twig/widget-creator/page.twig +0 -1
  26. readme.txt +5 -12
all-in-one-event-calendar.php CHANGED
@@ -5,7 +5,7 @@
5
  * Description: A calendar system with month, week, day, agenda views, upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
6
  * Author: Time.ly Network Inc.
7
  * Author URI: https://time.ly/
8
- * Version: 2.5.29
9
  * Text Domain: all-in-one-event-calendar
10
  * Domain Path: /language
11
  */
5
  * Description: A calendar system with month, week, day, agenda views, upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
6
  * Author: Time.ly Network Inc.
7
  * Author URI: https://time.ly/
8
+ * Version: 2.5.30
9
  * Text Domain: all-in-one-event-calendar
10
  * Domain Path: /language
11
  */
app/config/constants.php CHANGED
@@ -50,7 +50,7 @@ function ai1ec_initiate_constants( $ai1ec_base_dir, $ai1ec_base_url ) {
50
  // = Plugin Version =
51
  // ==================
52
  if ( ! defined( 'AI1EC_VERSION' ) ) {
53
- define( 'AI1EC_VERSION', '2.5.29' );
54
  }
55
 
56
  // ================
50
  // = Plugin Version =
51
  // ==================
52
  if ( ! defined( 'AI1EC_VERSION' ) ) {
53
+ define( 'AI1EC_VERSION', '2.5.30' );
54
  }
55
 
56
  // ================
app/model/settings.php CHANGED
@@ -883,7 +883,7 @@ class Ai1ec_Settings extends Ai1ec_App {
883
  'default' => null,
884
  ),
885
  'calendar_css_selector' => array(
886
- 'type' => 'string',
887
  'renderer' => array(
888
  'class' => 'input',
889
  'tab' => 'advanced',
883
  'default' => null,
884
  ),
885
  'calendar_css_selector' => array(
886
+ 'type' => 'deprecated',
887
  'renderer' => array(
888
  'class' => 'input',
889
  'tab' => 'advanced',
language/all-in-one-event-calendar.mo CHANGED
Binary file
language/all-in-one-event-calendar.po CHANGED
@@ -2,13 +2,13 @@
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.29\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
- "POT-Creation-Date: 2018-03-27 20:26:35+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
11
- "PO-Revision-Date: 2018-03-27 20:26+0000\n"
12
  "Last-Translator: Timely <support@time.ly>\n"
13
  "Language-Team:\n"
14
 
@@ -1893,7 +1893,7 @@ msgid "Categories:"
1893
  msgstr "Categories:"
1894
 
1895
  #: app/view/calendar/view/agenda.php:208 lib/theme/list.php:320
1896
- #: public/admin/themes.php:29
1897
  msgid "Tags:"
1898
  msgstr "Tags:"
1899
 
@@ -2916,7 +2916,7 @@ msgid "Activate"
2916
  msgstr "Activate"
2917
 
2918
  #. translators: 1: theme title, 2: theme version, 3: theme author
2919
- #: lib/theme/list.php:281 public/admin/themes.php:25
2920
  msgid "%1$s %2$s by %3$s"
2921
  msgstr "%1$s %2$s by %3$s"
2922
 
@@ -3820,7 +3820,7 @@ msgctxt "Recurrence editor - yearly tab"
3820
  msgid "In"
3821
  msgstr "In"
3822
 
3823
- #: public/admin/settings.php:19
3824
  msgid "Update Settings"
3825
  msgstr "Update Settings"
3826
 
@@ -3844,32 +3844,32 @@ msgstr "New theme activated. <a href=\"%s\">Visit site</a>"
3844
  msgid "Theme deleted."
3845
  msgstr "Theme deleted."
3846
 
3847
- #: public/admin/themes-install.php:37 public/admin/themes-install.php:44
3848
  msgid "Manage Themes"
3849
  msgstr "Manage Themes"
3850
 
3851
- #: public/admin/themes-install.php:40
3852
  msgctxt "theme"
3853
  msgid "Install Themes"
3854
  msgstr "Install Themes"
3855
 
3856
- #: public/admin/themes-updated.php:5
3857
  msgid "Update Calendar Themes"
3858
  msgstr "Update Calendar Themes"
3859
 
3860
- #: public/admin/themes-updated.php:15
3861
  msgid "All-in-One Event Calendar Settings »"
3862
  msgstr "All-in-One Event Calendar Settings »"
3863
 
3864
- #: public/admin/themes.php:18
3865
  msgid "Current Calendar Theme"
3866
  msgstr "Current Calendar Theme"
3867
 
3868
- #: public/admin/themes.php:21
3869
  msgid "Current theme preview"
3870
  msgstr "Current theme preview"
3871
 
3872
- #: public/admin/themes.php:47
3873
  msgid "Available Calendar Themes"
3874
  msgstr "Available Calendar Themes"
3875
 
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.30\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
+ "POT-Creation-Date: 2018-04-11 19:41:23+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
11
+ "PO-Revision-Date: 2018-04-11 19:41+0000\n"
12
  "Last-Translator: Timely <support@time.ly>\n"
13
  "Language-Team:\n"
14
 
1893
  msgstr "Categories:"
1894
 
1895
  #: app/view/calendar/view/agenda.php:208 lib/theme/list.php:320
1896
+ #: public/admin/themes.php:28
1897
  msgid "Tags:"
1898
  msgstr "Tags:"
1899
 
2916
  msgstr "Activate"
2917
 
2918
  #. translators: 1: theme title, 2: theme version, 3: theme author
2919
+ #: lib/theme/list.php:281 public/admin/themes.php:24
2920
  msgid "%1$s %2$s by %3$s"
2921
  msgstr "%1$s %2$s by %3$s"
2922
 
3820
  msgid "In"
3821
  msgstr "In"
3822
 
3823
+ #: public/admin/settings.php:17
3824
  msgid "Update Settings"
3825
  msgstr "Update Settings"
3826
 
3844
  msgid "Theme deleted."
3845
  msgstr "Theme deleted."
3846
 
3847
+ #: public/admin/themes-install.php:36 public/admin/themes-install.php:43
3848
  msgid "Manage Themes"
3849
  msgstr "Manage Themes"
3850
 
3851
+ #: public/admin/themes-install.php:39
3852
  msgctxt "theme"
3853
  msgid "Install Themes"
3854
  msgstr "Install Themes"
3855
 
3856
+ #: public/admin/themes-updated.php:3
3857
  msgid "Update Calendar Themes"
3858
  msgstr "Update Calendar Themes"
3859
 
3860
+ #: public/admin/themes-updated.php:13
3861
  msgid "All-in-One Event Calendar Settings »"
3862
  msgstr "All-in-One Event Calendar Settings »"
3863
 
3864
+ #: public/admin/themes.php:17
3865
  msgid "Current Calendar Theme"
3866
  msgstr "Current Calendar Theme"
3867
 
3868
+ #: public/admin/themes.php:20
3869
  msgid "Current theme preview"
3870
  msgstr "Current theme preview"
3871
 
3872
+ #: public/admin/themes.php:46
3873
  msgid "Available Calendar Themes"
3874
  msgstr "Available Calendar Themes"
3875
 
language/all-in-one-event-calendar.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.29\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
- "POT-Creation-Date: 2018-03-27 20:26:35+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -1705,7 +1705,7 @@ msgid "Categories:"
1705
  msgstr ""
1706
 
1707
  #: app/view/calendar/view/agenda.php:208 lib/theme/list.php:320
1708
- #: public/admin/themes.php:29
1709
  msgid "Tags:"
1710
  msgstr ""
1711
 
@@ -2652,7 +2652,7 @@ msgid "Activate"
2652
  msgstr ""
2653
 
2654
  #. translators: 1: theme title, 2: theme version, 3: theme author
2655
- #: lib/theme/list.php:281 public/admin/themes.php:25
2656
  msgid "%1$s %2$s by %3$s"
2657
  msgstr ""
2658
 
@@ -3508,7 +3508,7 @@ msgctxt "Recurrence editor - yearly tab"
3508
  msgid "In"
3509
  msgstr ""
3510
 
3511
- #: public/admin/settings.php:19
3512
  msgid "Update Settings"
3513
  msgstr ""
3514
 
@@ -3530,32 +3530,32 @@ msgstr ""
3530
  msgid "Theme deleted."
3531
  msgstr ""
3532
 
3533
- #: public/admin/themes-install.php:37 public/admin/themes-install.php:44
3534
  msgid "Manage Themes"
3535
  msgstr ""
3536
 
3537
- #: public/admin/themes-install.php:40
3538
  msgctxt "theme"
3539
  msgid "Install Themes"
3540
  msgstr ""
3541
 
3542
- #: public/admin/themes-updated.php:5
3543
  msgid "Update Calendar Themes"
3544
  msgstr ""
3545
 
3546
- #: public/admin/themes-updated.php:15
3547
  msgid "All-in-One Event Calendar Settings »"
3548
  msgstr ""
3549
 
3550
- #: public/admin/themes.php:18
3551
  msgid "Current Calendar Theme"
3552
  msgstr ""
3553
 
3554
- #: public/admin/themes.php:21
3555
  msgid "Current theme preview"
3556
  msgstr ""
3557
 
3558
- #: public/admin/themes.php:47
3559
  msgid "Available Calendar Themes"
3560
  msgstr ""
3561
 
2
  # This file is distributed under the same license as the All-in-One Event Calendar by Time.ly package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: All-in-One Event Calendar by Time.ly 2.5.30\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/all-in-one-event-calendar\n"
7
+ "POT-Creation-Date: 2018-04-11 19:41:23+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
1705
  msgstr ""
1706
 
1707
  #: app/view/calendar/view/agenda.php:208 lib/theme/list.php:320
1708
+ #: public/admin/themes.php:28
1709
  msgid "Tags:"
1710
  msgstr ""
1711
 
2652
  msgstr ""
2653
 
2654
  #. translators: 1: theme title, 2: theme version, 3: theme author
2655
+ #: lib/theme/list.php:281 public/admin/themes.php:24
2656
  msgid "%1$s %2$s by %3$s"
2657
  msgstr ""
2658
 
3508
  msgid "In"
3509
  msgstr ""
3510
 
3511
+ #: public/admin/settings.php:17
3512
  msgid "Update Settings"
3513
  msgstr ""
3514
 
3530
  msgid "Theme deleted."
3531
  msgstr ""
3532
 
3533
+ #: public/admin/themes-install.php:36 public/admin/themes-install.php:43
3534
  msgid "Manage Themes"
3535
  msgstr ""
3536
 
3537
+ #: public/admin/themes-install.php:39
3538
  msgctxt "theme"
3539
  msgid "Install Themes"
3540
  msgstr ""
3541
 
3542
+ #: public/admin/themes-updated.php:3
3543
  msgid "Update Calendar Themes"
3544
  msgstr ""
3545
 
3546
+ #: public/admin/themes-updated.php:13
3547
  msgid "All-in-One Event Calendar Settings »"
3548
  msgstr ""
3549
 
3550
+ #: public/admin/themes.php:17
3551
  msgid "Current Calendar Theme"
3552
  msgstr ""
3553
 
3554
+ #: public/admin/themes.php:20
3555
  msgid "Current theme preview"
3556
  msgstr ""
3557
 
3558
+ #: public/admin/themes.php:46
3559
  msgid "Available Calendar Themes"
3560
  msgstr ""
3561
 
lib/html/element/setting/cache.php CHANGED
@@ -14,11 +14,11 @@ class Ai1ec_Html_Setting_Cache extends Ai1ec_Html_Element_Settings {
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
- public function render( $output = '' ) {
18
  $args = $this->get_twig_cache_args();
19
  $loader = $this->_registry->get( 'theme.loader' );
20
  $file = $loader->get_file( 'setting/twig_cache.twig', $args, true );
21
- return parent::render( $file->get_content() );
22
  }
23
 
24
  /**
@@ -45,4 +45,4 @@ class Ai1ec_Html_Setting_Cache extends Ai1ec_Html_Element_Settings {
45
 
46
  return $args;
47
  }
48
- }
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
+ public function render( $output = '', $wrap = true, $hidden = false ) {
18
  $args = $this->get_twig_cache_args();
19
  $loader = $this->_registry->get( 'theme.loader' );
20
  $file = $loader->get_file( 'setting/twig_cache.twig', $args, true );
21
+ return parent::render( $file->get_content(), $wrap, $hidden );
22
  }
23
 
24
  /**
45
 
46
  return $args;
47
  }
48
+ }
lib/html/element/setting/calendar-page-selector.php CHANGED
@@ -45,12 +45,12 @@ class Ai1ec_Html_Element_Calendar_Page_Selector
45
  *
46
  * @return string HTML snippet for page selection.
47
  */
48
- public function render( $snippet = '' ) {
49
  $output = '<label class="ai1ec-control-label ai1ec-col-sm-5" for="' .
50
  self::ELEMENT_ID . '">' . Ai1ec_I18n::__( 'Calendar page' ) . '</label>'
51
  . '<div class="ai1ec-col-sm-7">' .
52
  $this->_get_pages_selector() . $this->_get_page_view_link() . '</div>';
53
- return parent::render( $output );
54
  }
55
 
56
  /**
45
  *
46
  * @return string HTML snippet for page selection.
47
  */
48
+ public function render( $snippet = '', $wrap = true, $hidden = false ) {
49
  $output = '<label class="ai1ec-control-label ai1ec-col-sm-5" for="' .
50
  self::ELEMENT_ID . '">' . Ai1ec_I18n::__( 'Calendar page' ) . '</label>'
51
  . '<div class="ai1ec-col-sm-7">' .
52
  $this->_get_pages_selector() . $this->_get_page_view_link() . '</div>';
53
+ return parent::render( $output, $wrap, $hidden );
54
  }
55
 
56
  /**
lib/html/element/setting/checkbox.php CHANGED
@@ -15,7 +15,7 @@ class Ai1ec_Html_Settings_Checkbox extends Ai1ec_Html_Element_Settings {
15
  /* (non-PHPdoc)
16
  * @see Ai1ec_Html_Element_Settings::render()
17
  */
18
- public function render( $output = '' ) {
19
  $attributes = array(
20
  'class' => 'checkbox',
21
  );
@@ -30,7 +30,7 @@ class Ai1ec_Html_Settings_Checkbox extends Ai1ec_Html_Element_Settings {
30
  $args,
31
  true
32
  );
33
- return parent::render( $file->get_content() );
34
  }
35
 
36
- }
15
  /* (non-PHPdoc)
16
  * @see Ai1ec_Html_Element_Settings::render()
17
  */
18
+ public function render( $output = '', $wrap = true, $hidden = false ) {
19
  $attributes = array(
20
  'class' => 'checkbox',
21
  );
30
  $args,
31
  true
32
  );
33
+ return parent::render( $file->get_content(), $wrap, $hidden );
34
  }
35
 
36
+ }
lib/html/element/setting/custom.php CHANGED
@@ -14,7 +14,7 @@ class Ai1ec_Html_Setting_Custom extends Ai1ec_Html_Element_Settings {
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
- public function render( $output = '' ) {
18
  $label = $this->_args['renderer']['label'];
19
  $content = $this->_args['renderer']['content'];
20
  $loader = $this->_registry->get( 'theme.loader' );
@@ -22,7 +22,7 @@ class Ai1ec_Html_Setting_Custom extends Ai1ec_Html_Element_Settings {
22
  'label' => $label,
23
  'content' => $content
24
  ), true );
25
- return parent::render( $file->get_content() );
26
  }
27
 
28
  }
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
+ public function render( $output = '', $wrap = true, $hidden = false ) {
18
  $label = $this->_args['renderer']['label'];
19
  $content = $this->_args['renderer']['content'];
20
  $loader = $this->_registry->get( 'theme.loader' );
22
  'label' => $label,
23
  'content' => $content
24
  ), true );
25
+ return parent::render( $file->get_content(), $wrap, $hidden );
26
  }
27
 
28
  }
lib/html/element/setting/enabled-views.php CHANGED
@@ -14,7 +14,7 @@ class Ai1ec_Html_Element_Enabled_Views
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
- public function render( $output = '' ) {
18
  $this->_convert_values();
19
  $args = array(
20
  'views' => $this->_args['value'],
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
+ public function render( $output = '', $wrap = true, $hidden = false ) {
18
  $this->_convert_values();
19
  $args = array(
20
  'views' => $this->_args['value'],
lib/html/element/setting/html.php CHANGED
@@ -14,7 +14,7 @@ class Ai1ec_Html_Setting_Html extends Ai1ec_Html_Element_Settings {
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
- public function render( $output = '' ) {
18
  $file = $this->_args['id'] . '.twig';
19
  $method = 'get_' . $this->_args['id'] . '_args';
20
  $args = array();
@@ -23,7 +23,7 @@ class Ai1ec_Html_Setting_Html extends Ai1ec_Html_Element_Settings {
23
  }
24
  $loader = $this->_registry->get( 'theme.loader' );
25
  $file = $loader->get_file( 'setting/' . $file, $args, true );
26
- return parent::render( $file->get_content() );
27
  }
28
 
29
  /*
@@ -67,4 +67,4 @@ class Ai1ec_Html_Setting_Html extends Ai1ec_Html_Element_Settings {
67
  );
68
  }
69
 
70
- }
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
+ public function render( $output = '', $wrap = true, $hidden = false ) {
18
  $file = $this->_args['id'] . '.twig';
19
  $method = 'get_' . $this->_args['id'] . '_args';
20
  $args = array();
23
  }
24
  $loader = $this->_registry->get( 'theme.loader' );
25
  $file = $loader->get_file( 'setting/' . $file, $args, true );
26
+ return parent::render( $file->get_content(), $wrap, $hidden );
27
  }
28
 
29
  /*
67
  );
68
  }
69
 
70
+ }
lib/html/element/setting/input.php CHANGED
@@ -15,7 +15,7 @@ class Ai1ec_Html_Setting_Input extends Ai1ec_Html_Element_Settings {
15
  /* (non-PHPdoc)
16
  * @see Ai1ec_Html_Element_Settings::render()
17
  */
18
- public function render( $output = '' ) {
19
  $system = $this->_registry->get( 'date.system' );
20
  $type = $this->_args['renderer']['type'];
21
  $date = $append = false;
@@ -92,7 +92,7 @@ class Ai1ec_Html_Setting_Input extends Ai1ec_Html_Element_Settings {
92
  } else {
93
  $hidden = false;
94
  }
95
- return parent::render( $file->get_content(), true, $hidden );
96
  }
97
 
98
  }
15
  /* (non-PHPdoc)
16
  * @see Ai1ec_Html_Element_Settings::render()
17
  */
18
+ public function render( $output = '', $wrap = true, $hidden = false ) {
19
  $system = $this->_registry->get( 'date.system' );
20
  $type = $this->_args['renderer']['type'];
21
  $date = $append = false;
92
  } else {
93
  $hidden = false;
94
  }
95
+ return parent::render( $file->get_content(), $wrap, $hidden );
96
  }
97
 
98
  }
lib/html/element/setting/select.php CHANGED
@@ -14,7 +14,7 @@ class Ai1ec_Html_Setting_Select extends Ai1ec_Html_Element_Settings {
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
- public function render( $output = '' ) {
18
  $options = $this->_args['renderer']['options'];
19
  if ( ! is_array( $options ) ) {
20
  $callback = explode( ':', $options );
@@ -65,7 +65,7 @@ class Ai1ec_Html_Setting_Select extends Ai1ec_Html_Element_Settings {
65
  );
66
  $loader = $this->_registry->get( 'theme.loader' );
67
  $file = $loader->get_file( 'setting/select.twig', $args, true );
68
- return parent::render( $file->get_content() );
69
  }
70
 
71
  /**
14
  /* (non-PHPdoc)
15
  * @see Ai1ec_Html_Element_Settings::render()
16
  */
17
+ public function render( $output = '', $wrap = true, $hidden = false ) {
18
  $options = $this->_args['renderer']['options'];
19
  if ( ! is_array( $options ) ) {
20
  $callback = explode( ':', $options );
65
  );
66
  $loader = $this->_registry->get( 'theme.loader' );
67
  $file = $loader->get_file( 'setting/select.twig', $args, true );
68
+ return parent::render( $file->get_content(), $wrap, $hidden );
69
  }
70
 
71
  /**
lib/html/element/setting/tags-categories.php CHANGED
@@ -15,7 +15,7 @@ class Ai1ec_Html_Setting_Tags_Categories extends Ai1ec_Html_Element_Settings {
15
  /* (non-PHPdoc)
16
  * @see Ai1ec_Html_Element_Settings::render()
17
  */
18
- public function render( $output = '' ) {
19
  $tags = array();
20
  $categories = array();
21
  foreach ( array( 'tags', 'categories' ) as $type ) {
15
  /* (non-PHPdoc)
16
  * @see Ai1ec_Html_Element_Settings::render()
17
  */
18
+ public function render( $output = '', $wrap = true, $hidden = false ) {
19
  $tags = array();
20
  $categories = array();
21
  foreach ( array( 'tags', 'categories' ) as $type ) {
lib/html/element/setting/textarea.php CHANGED
@@ -16,7 +16,7 @@ class Ai1ec_Html_Setting_Textarea extends Ai1ec_Html_Element_Settings {
16
  /* (non-PHPdoc)
17
  * @see Ai1ec_Html_Element_Settings::render()
18
  */
19
- public function render( $output = '' ) {
20
  $type = $this->_args['renderer']['type'];
21
  $date = $append = false;
22
 
@@ -52,7 +52,7 @@ class Ai1ec_Html_Setting_Textarea extends Ai1ec_Html_Element_Settings {
52
  }
53
  $loader = $this->_registry->get( 'theme.loader' );
54
  $file = $loader->get_file( 'setting/textarea.twig', $args, true );
55
- return parent::render( $file->get_content() );
56
  }
57
 
58
  }
16
  /* (non-PHPdoc)
17
  * @see Ai1ec_Html_Element_Settings::render()
18
  */
19
+ public function render( $output = '', $wrap = true, $hidden = false ) {
20
  $type = $this->_args['renderer']['type'];
21
  $date = $append = false;
22
 
52
  }
53
  $loader = $this->_registry->get( 'theme.loader' );
54
  $file = $loader->get_file( 'setting/textarea.twig', $args, true );
55
+ return parent::render( $file->get_content(), $wrap, $hidden );
56
  }
57
 
58
  }
lib/twig/ai1ec-extension.php CHANGED
@@ -30,7 +30,6 @@ class Ai1ec_Twig_Ai1ec_Extension extends Twig_Extension {
30
  */
31
  public function getFunctions() {
32
  return array(
33
- 'screen_icon' => new Twig_Function_Method( $this, 'screen_icon' ),
34
  'wp_nonce_field' => new Twig_Function_Method( $this, 'wp_nonce_field' ),
35
  'do_meta_boxes' => new Twig_Function_Method( $this, 'do_meta_boxes' ),
36
  'fb' => new Twig_Function_Method( $this, 'fb' ),
@@ -327,19 +326,6 @@ class Ai1ec_Twig_Ai1ec_Extension extends Twig_Extension {
327
  return $string;
328
  }
329
 
330
- /**
331
- * Displays a screen icon.
332
- *
333
- * @uses get_screen_icon()
334
- * @since 2.7.0
335
- *
336
- * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object)
337
- * which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID.
338
- */
339
- public function screen_icon( $screen = '' ){
340
- return screen_icon( $screen );
341
- }
342
-
343
  /**
344
  * Generate a timespan HTML block for an event.
345
  *
30
  */
31
  public function getFunctions() {
32
  return array(
 
33
  'wp_nonce_field' => new Twig_Function_Method( $this, 'wp_nonce_field' ),
34
  'do_meta_boxes' => new Twig_Function_Method( $this, 'do_meta_boxes' ),
35
  'fb' => new Twig_Function_Method( $this, 'fb' ),
326
  return $string;
327
  }
328
 
 
 
 
 
 
 
 
 
 
 
 
 
 
329
  /**
330
  * Generate a timespan HTML block for an event.
331
  *
public/admin/base_page.php CHANGED
@@ -1,7 +1,5 @@
1
  <div class="wrap">
2
 
3
- <?php screen_icon(); ?>
4
-
5
  <h2><?php echo $page->title; ?></h2>
6
 
7
  <div id="poststuff">
1
  <div class="wrap">
2
 
 
 
3
  <h2><?php echo $page->title; ?></h2>
4
 
5
  <div id="poststuff">
public/admin/feeds_settings.php CHANGED
@@ -1,7 +1,5 @@
1
  <div class="wrap">
2
 
3
- <?php screen_icon(); ?>
4
-
5
  <h2><?php echo $title; ?></h2>
6
 
7
  <div id="poststuff">
1
  <div class="wrap">
2
 
 
 
3
  <h2><?php echo $title; ?></h2>
4
 
5
  <div id="poststuff">
public/admin/settings.php CHANGED
@@ -1,7 +1,5 @@
1
  <div class="wrap">
2
 
3
- <?php screen_icon(); ?>
4
-
5
  <h2><?php echo $title; ?></h2>
6
 
7
  <div id="poststuff">
1
  <div class="wrap">
2
 
 
 
3
  <h2><?php echo $title; ?></h2>
4
 
5
  <div id="poststuff">
public/admin/themes-install.php CHANGED
@@ -30,7 +30,6 @@
30
 
31
  <div class="wrap">
32
  <?php
33
- screen_icon();
34
  if( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
35
  <h2 class="nav-tab-wrapper">
36
  <a href="<?php echo ai1ec_admin_url( AI1EC_THEME_SELECTION_BASE_URL ) ?>" class="nav-tab nav-tab-active">
30
 
31
  <div class="wrap">
32
  <?php
 
33
  if( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
34
  <h2 class="nav-tab-wrapper">
35
  <a href="<?php echo ai1ec_admin_url( AI1EC_THEME_SELECTION_BASE_URL ) ?>" class="nav-tab nav-tab-active">
public/admin/themes-updated.php CHANGED
@@ -1,7 +1,5 @@
1
  <div class="wrap">
2
 
3
- <?php screen_icon(); ?>
4
-
5
  <h2><?php _e( 'Update Calendar Themes', AI1EC_PLUGIN_NAME ); ?></h2>
6
 
7
  <?php echo $msg; ?>
1
  <div class="wrap">
2
 
 
 
3
  <h2><?php _e( 'Update Calendar Themes', AI1EC_PLUGIN_NAME ); ?></h2>
4
 
5
  <?php echo $msg; ?>
public/admin/themes.php CHANGED
@@ -13,7 +13,6 @@
13
  <?php endif; ?>
14
 
15
  <div class="wrap">
16
- <?php screen_icon() ?>
17
  <h2><?php echo esc_html( $page_title ); ?></h2>
18
  <h3><?php _e( 'Current Calendar Theme', AI1EC_PLUGIN_NAME ); ?></h3>
19
  <div id="current-theme"<?php echo ( $ct->screenshot ) ? ' class="has-screenshot"' : '' ?>>
13
  <?php endif; ?>
14
 
15
  <div class="wrap">
 
16
  <h2><?php echo esc_html( $page_title ); ?></h2>
17
  <h3><?php _e( 'Current Calendar Theme', AI1EC_PLUGIN_NAME ); ?></h3>
18
  <div id="current-theme"<?php echo ( $ct->screenshot ) ? ' class="has-screenshot"' : '' ?>>
public/admin/twig/base_page.twig CHANGED
@@ -1,5 +1,4 @@
1
  <div class="wrap">
2
- {{ screen_icon() }}
3
  <h2>{{ title }}</h2>
4
  <div id="poststuff">
5
  <form method="post" action="{{ action }}">
1
  <div class="wrap">
 
2
  <h2>{{ title }}</h2>
3
  <div id="poststuff">
4
  <form method="post" action="{{ action }}">
public/admin/twig/widget-creator/page.twig CHANGED
@@ -1,5 +1,4 @@
1
  <div class="wrap">
2
- {{ screen_icon() }}
3
  <h2>{{ title }}</h2>
4
  <div id="poststuff">
5
  <div class="metabox-holder">
1
  <div class="wrap">
 
2
  <h2>{{ title }}</h2>
3
  <div id="poststuff">
4
  <div class="metabox-holder">
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: uchu, calvinyeh, raquelleira, renatotbueno, domanb, elirenato, hub
3
  Tags: calendar, event, ical, feed, ics, icalendar, sync, aggregator, google, venue, calendar widget, events widget
4
  Requires at least: 3.5
5
  Tested up to: 4.9.5
6
- Stable tag: 2.5.29
7
  License: GNU General Public License, version 3 (GPL-3.0)
8
 
9
  An events calendar system with multiple views, upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
@@ -129,6 +129,10 @@ https://vimeo.com/135004810
129
 
130
  == Changelog ==
131
 
 
 
 
 
132
  = Version 2.5.29 =
133
  * Fixed: Removed type hint from Exception Handler method for PHP 7 compatibility.
134
  * Renamed "No CAPTCHA" to "reCAPTCHA V2".
@@ -1278,17 +1282,6 @@ WordPress Dashboard.
1278
  3. Once the plugin is activated, follow the instructions in the notice
1279
  to configure it.
1280
 
1281
- = For advanced users: =
1282
-
1283
- To place the calendar in a DOM/HTML element besides the default page
1284
- content container without modifying the theme:
1285
-
1286
- 1. Navigate to **Events** > **Settings** > **Advanced** > **Advanced
1287
- Settings** in the WordPress Dashboard.
1288
- 2. Enter a CSS or jQuery-style selector of the target element in the
1289
- **Move calendar into this DOM element** field.
1290
- 3. Click **Update**.
1291
-
1292
  == Screenshots ==
1293
 
1294
  1. Posterboard view
3
  Tags: calendar, event, ical, feed, ics, icalendar, sync, aggregator, google, venue, calendar widget, events widget
4
  Requires at least: 3.5
5
  Tested up to: 4.9.5
6
+ Stable tag: 2.5.30
7
  License: GNU General Public License, version 3 (GPL-3.0)
8
 
9
  An events calendar system with multiple views, upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
129
 
130
  == Changelog ==
131
 
132
+ = Version 2.5.30 =
133
+ * Fixed compatibility with PHP 7.2
134
+ * Clean up: Removing use of deprecated WordPress function.
135
+
136
  = Version 2.5.29 =
137
  * Fixed: Removed type hint from Exception Handler method for PHP 7 compatibility.
138
  * Renamed "No CAPTCHA" to "reCAPTCHA V2".
1282
  3. Once the plugin is activated, follow the instructions in the notice
1283
  to configure it.
1284
 
 
 
 
 
 
 
 
 
 
 
 
1285
  == Screenshots ==
1286
 
1287
  1. Posterboard view