All-in-One Event Calendar - Version 1.10.4

Version Description

Download this release

Release Info

Developer nicola.peluchetti
Plugin Icon 128x128 All-in-One Event Calendar
Version 1.10.4
Comparing to
See all releases

Code changes from version 1.10.3 to 1.10.4

Files changed (3) hide show
  1. all-in-one-event-calendar.php +27 -2
  2. app/helper/class-ai1ec-view-helper.php +12 -1
  3. readme.txt +6 -3
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: Timely
7
  * Author URI: http://time.ly/
8
- * Version: 1.10.3
9
  */
10
  @set_time_limit( 0 );
11
  @ini_set( 'memory_limit', '256M' );
@@ -24,7 +24,7 @@ define( 'AI1EC_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
24
  // ==================
25
  // = Plugin Version =
26
  // ==================
27
- define( 'AI1EC_VERSION', '1.10.3' );
28
 
29
  // ====================
30
  // = Database Version =
@@ -98,6 +98,21 @@ define( 'AI1EC_VIEW_PATH', AI1EC_APP_PATH . '/view' );
98
  // ====================
99
  define( 'AI1EC_ADMIN_THEME_PATH', AI1EC_VIEW_PATH . '/admin' );
100
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
101
  // ==================
102
  // = Admin theme CSS path =
103
  // ==================
@@ -143,6 +158,16 @@ define( 'AI1EC_CSS_URL', AI1EC_URL . '/' . AI1EC_CSS_FOLDER );
143
  // ==========
144
  define( 'AI1EC_JS_URL', AI1EC_URL . '/' . AI1EC_JS_FOLDER );
145
 
 
 
 
 
 
 
 
 
 
 
146
  // ================
147
  // = Admin JS URL =
148
  // ================
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: Timely
7
  * Author URI: http://time.ly/
8
+ * Version: 1.10.4
9
  */
10
  @set_time_limit( 0 );
11
  @ini_set( 'memory_limit', '256M' );
24
  // ==================
25
  // = Plugin Version =
26
  // ==================
27
+ define( 'AI1EC_VERSION', '1.10.4' );
28
 
29
  // ====================
30
  // = Database Version =
98
  // ====================
99
  define( 'AI1EC_ADMIN_THEME_PATH', AI1EC_VIEW_PATH . '/admin' );
100
 
101
+ // =======================
102
+ // = Admin Local JS Path =
103
+ // =======================
104
+ define( 'AI1EC_LOCAL_JS_THEME_PATH', AI1EC_PATH . '/themes-ai1ec/vortex/js' );
105
+
106
+ // =======================
107
+ // = Admin Local JS Path =
108
+ // =======================
109
+ define( 'AI1EC_LOCAL_CSS_THEME_PATH', AI1EC_PATH . '/themes-ai1ec/vortex/css' );
110
+
111
+ // =======================
112
+ // = Admin Local JS Path =
113
+ // =======================
114
+ define( 'AI1EC_LOCAL_VIEW_THEME_PATH', AI1EC_PATH . '/themes-ai1ec/vortex' );
115
+
116
  // ==================
117
  // = Admin theme CSS path =
118
  // ==================
158
  // ==========
159
  define( 'AI1EC_JS_URL', AI1EC_URL . '/' . AI1EC_JS_FOLDER );
160
 
161
+ // ================
162
+ // = JS local URL =
163
+ // ================
164
+ define( 'AI1EC_LOCAL_JS_URL', AI1EC_URL . '/themes-ai1ec/vortex/js' );
165
+
166
+ // =================
167
+ // = CSS local URL =
168
+ // =================
169
+ define( 'AI1EC_LOCAL_CSS_URL', AI1EC_URL . '/themes-ai1ec/vortex/css' );
170
+
171
  // ================
172
  // = Admin JS URL =
173
  // ================
app/helper/class-ai1ec-view-helper.php CHANGED
@@ -101,8 +101,13 @@ class Ai1ec_View_Helper {
101
  'path' => AI1EC_DEFAULT_THEME_PATH . '/' . AI1EC_JS_FOLDER,
102
  'url' => AI1EC_DEFAULT_THEME_URL . '/' . AI1EC_JS_FOLDER
103
  ),
 
 
 
 
104
  );
105
 
 
106
  $file_found = false;
107
 
108
  // look for the file in each theme
@@ -110,6 +115,7 @@ class Ai1ec_View_Helper {
110
  // $_file is a local var to hold the value of
111
  // the file we are looking for
112
  $_file = $theme_root->path . '/' . $file;
 
113
  if( file_exists( $_file ) ) {
114
  // file is found
115
  $file_found = true;
@@ -191,6 +197,10 @@ class Ai1ec_View_Helper {
191
  'path' => AI1EC_DEFAULT_THEME_PATH,
192
  'url' => AI1EC_DEFAULT_THEME_URL
193
  ),
 
 
 
 
194
  );
195
 
196
  $file_found = false;
@@ -270,7 +280,8 @@ class Ai1ec_View_Helper {
270
  // look for the file in the selected theme
271
  $themes_root = array(
272
  $ai1ec_themes_controller->active_template_path(),
273
- AI1EC_DEFAULT_THEME_PATH
 
274
  );
275
 
276
  // remove duplicates
101
  'path' => AI1EC_DEFAULT_THEME_PATH . '/' . AI1EC_JS_FOLDER,
102
  'url' => AI1EC_DEFAULT_THEME_URL . '/' . AI1EC_JS_FOLDER
103
  ),
104
+ (object) array(
105
+ 'path' => AI1EC_LOCAL_JS_THEME_PATH,
106
+ 'url' => AI1EC_LOCAL_JS_URL
107
+ ),
108
  );
109
 
110
+
111
  $file_found = false;
112
 
113
  // look for the file in each theme
115
  // $_file is a local var to hold the value of
116
  // the file we are looking for
117
  $_file = $theme_root->path . '/' . $file;
118
+
119
  if( file_exists( $_file ) ) {
120
  // file is found
121
  $file_found = true;
197
  'path' => AI1EC_DEFAULT_THEME_PATH,
198
  'url' => AI1EC_DEFAULT_THEME_URL
199
  ),
200
+ (object) array(
201
+ 'path' => AI1EC_LOCAL_CSS_THEME_PATH,
202
+ 'url' => AI1EC_LOCAL_CSS_URL
203
+ ),
204
  );
205
 
206
  $file_found = false;
280
  // look for the file in the selected theme
281
  $themes_root = array(
282
  $ai1ec_themes_controller->active_template_path(),
283
+ AI1EC_DEFAULT_THEME_PATH,
284
+ AI1EC_LOCAL_VIEW_THEME_PATH
285
  );
286
 
287
  // remove duplicates
readme.txt CHANGED
@@ -1,10 +1,10 @@
1
  === All-in-One Event Calendar ===
2
- Contributors: theseed, hubrik, vtowel, yani.iliev, jbutkus
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9JJMUW48W2ED8
4
  Tags: calendar, events, ics, ics feed, wordpress ical importer, google calendar, ical, iCalendar, all-in-one, events sync, events widget, calendar widget
5
  Requires at least: 3.2
6
- Tested up to: 3.6
7
- Stable tag: 1.10.3
8
  License: GNU General Public License, version 3 (GPL-3.0)
9
 
10
  A calendar system with month, week, day, agenda views; upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
@@ -81,6 +81,9 @@ http://www.youtube.com/watch?v=XJ-KHOqBKuQ
81
  * Filter by post ids (separate ids by comma): **[ai1ec post_id="1, 2"]**
82
 
83
  == Changelog ==
 
 
 
84
 
85
  = Version 1.10.3 =
86
  * Removed GPL license incompatible library
1
  === All-in-One Event Calendar ===
2
+ Contributors: hubrik, jbutkus, nicola.peluchetti, vtowel, jeffrey wilcox
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9JJMUW48W2ED8
4
  Tags: calendar, events, ics, ics feed, wordpress ical importer, google calendar, ical, iCalendar, all-in-one, events sync, events widget, calendar widget
5
  Requires at least: 3.2
6
+ Tested up to: 3.7
7
+ Stable tag: 1.10.4
8
  License: GNU General Public License, version 3 (GPL-3.0)
9
 
10
  A calendar system with month, week, day, agenda views; upcoming events widget, color-coded categories, recurrence, and import/export of .ics feeds.
81
  * Filter by post ids (separate ids by comma): **[ai1ec post_id="1, 2"]**
82
 
83
  == Changelog ==
84
+ = Version 1.10.4 =
85
+ * Loads css/js/view files directly from our plugin theme folder to
86
+ fix problems in 3.7 upgrade procedure that deletes one of our files.
87
 
88
  = Version 1.10.3 =
89
  * Removed GPL license incompatible library