Merge pull request #160 from RRZE-Webteam/dev

Dev
RRZE-Webteam · Aug 10, 2023 · 1a818ab · 1a818ab
2 parents 334f18a + 5d64d7a
commit 1a818ab
Show file tree

Hide file tree

Showing 55 changed files with 324 additions and 5,681 deletions.
diff --git a/build/calendar.css b/build/calendar.css
diff --git a/composer.json b/composer.json
@@ -9,7 +9,6 @@
         "rrze/wp": "^1.2.1",
         "johngrogg/ics-parser": "^3.2.1",
         "rlanvin/php-rrule": "^2.4.1",
-        "jsvrcek/ics": "^0.8.4",
         "cmb2/cmb2": "^2.10.1"
     },
     "suggest": {

diff --git a/includes/CPT/CalendarEvent.php b/includes/CPT/CalendarEvent.php
@@ -652,7 +652,7 @@ public static function displayEventMain($data)
 
         // Description
         echo '<div class="rrze-event-description" itemprop="description">';
-        echo wpautop($data['description']);
+        echo wpautop(do_shortcode($data['description']));
         echo '</div>';
     }
 

diff --git a/includes/CPT/Capabilities.php b/includes/CPT/Capabilities.php
@@ -13,23 +13,23 @@ protected static function currentCptArgs()
                 'capability_type' => CalendarEvent::POST_TYPE,
                 'capabilities' => [
                     // Meta capabilities
-                    'edit_post'              => 'edit_page',
-                    'read_post'              => 'read_page',
-                    'delete_post'            => 'delete_page',
+                    'edit_post'              => 'edit_post',
+                    'read_post'              => 'read_post',
+                    'delete_post'            => 'delete_post',
                     // Primitive capabilities used outside of map_meta_cap()
-                    'edit_posts'             => 'edit_pages',
-                    'edit_others_posts'      => 'edit_others_pages',
-                    'publish_posts'          => 'publish_pages',
-                    'read_private_posts'     => 'read_private_pages',
-                    // // Primitive capabilities used within map_meta_cap()
+                    'edit_posts'             => 'edit_posts',
+                    'edit_others_posts'      => 'edit_others_posts',
+                    'publish_posts'          => 'publish_posts',
+                    'read_private_posts'     => 'read_private_posts',
+                    // Primitive capabilities used within map_meta_cap()
                     'read'                   => 'read',
-                    'delete_posts'           => 'delete_pages',
-                    'delete_private_posts'   => 'delete_private_pages',
-                    'delete_published_posts' => 'delete_published_pages',
-                    'delete_others_posts'    => 'delete_others_pages',
-                    'edit_private_posts'     => 'edit_private_pages',
-                    'edit_published_posts'   => 'edit_published_pages',
-                    'create_posts'           => 'edit_pages'
+                    'delete_posts'           => 'delete_posts',
+                    'delete_private_posts'   => 'delete_private_posts',
+                    'delete_published_posts' => 'delete_published_posts',
+                    'delete_others_posts'    => 'delete_others_posts',
+                    'edit_private_posts'     => 'edit_private_posts',
+                    'edit_published_posts'   => 'edit_published_posts',
+                    'create_posts'           => 'edit_posts'
                 ],
                 'map_meta_cap' => true
             ],
@@ -45,7 +45,7 @@ protected static function currentCptArgs()
                     'edit_others_posts'      => 'edit_others_pages',
                     'publish_posts'          => 'publish_pages',
                     'read_private_posts'     => 'read_private_pages',
-                    // // Primitive capabilities used within map_meta_cap()
+                    // Primitive capabilities used within map_meta_cap()
                     'read'                   => 'read',
                     'delete_posts'           => 'delete_pages',
                     'delete_private_posts'   => 'delete_private_pages',