Merge pull request #75 from RRZE-Webteam/dev

Dev

Author: rvdforst

includes/Main.php

@@ -77,11 +77,11 @@ public function adminInit()
             return;
         }
 
-        $slugs = Endpoint::slugsTitles();
+        $slugs = Endpoint::getSlugs();
         $published = [];
         if (tos()->overwriteEndpoints()) {
-            foreach ($slugs as $slug => $title) {
-                $page = get_page_by_title($title);
+            foreach (array_keys($slugs) as $slug) {
+                $page = get_page_by_path($slug);
                 if (!is_null($page) && $page->post_status == 'publish') {
                     $published[$slug] = $page->ID;
                 }

includes/TOS/Endpoint.php

@@ -65,6 +65,7 @@ public static function addEndpoint()
 
     public static function endpointTemplateRedirect()
     {
+        $pagePath = '';
         $title = '';
         $prefix = '';
         $locale = Locale::getLocale();
@@ -84,17 +85,18 @@ public static function endpointTemplateRedirect()
                     wp_redirect(site_url($langSegment . $r));
                     exit;
                 } elseif ($urlSlug == $slug && $langCode == $lang) {
+                    $pagePath = $slug;
                     $title = self::slugsTitles()[$key];
                     $prefix = self::defaultSlugs()[$key];
                     break 2;
                 }
             }
         }
-        if (!$title || !$prefix) {
+        if (!$pagePath || !$title || !$prefix) {
             return;
         }
         if (tos()->overwriteEndpoints()) {
-            $page = get_page_by_title($title);
+            $page = get_page_by_path($pagePath);
             if (!is_null($page) && $page->post_status == 'publish') {
                 // Replaces double line breaks with paragraph elements
                 $content = wpautop($page->post_content);

rrze-legal.php

@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Legal
 Plugin URI:      https://gitlab.rrze.fau.de/rrze-webteam/rrze-legal
 Description:     Legal Mandatory Information & GDPR.
-Version:         2.6.4
+Version:         2.6.5
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License Version 3