Merge pull request #58 from RRZE-Webteam/dev

rvdforst · web-flow · commit 8e0d60e9ff2a · 2022-09-21T15:57:03.000+02:00
Dev
diff --git a/includes/Consent/Frontend.php b/includes/Consent/Frontend.php
@@ -6,6 +6,7 @@
 
 use RRZE\Legal\Utils;
 use function RRZE\Legal\{plugin, consent};
+use const RRZE\PrivateSite\PRIVATE_SITE_OPTION;
 
 class Frontend
 {
@@ -183,6 +184,10 @@ public static function rrzePrivateSitePlugin()
             return false;
         }
 
+        if (empty(PRIVATE_SITE_OPTION) || !get_option(PRIVATE_SITE_OPTION)) {
+            return false;
+        }
+
         return true;
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rrze-legal",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "main": "rrze-legal.php",
     "scripts": {
         "start": "webpack --mode=development --watch",
diff --git a/rrze-legal.php b/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.5.0
+Version:         2.5.1
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License Version 3

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`use RRZE\Legal\Utils;`
`8`	`8`	`use function RRZE\Legal\{plugin, consent};`
	`9`	`+use const RRZE\PrivateSite\PRIVATE_SITE_OPTION;`
`9`	`10`
`10`	`11`	`class Frontend`
`11`	`12`	`{`
`@@ -183,6 +184,10 @@ public static function rrzePrivateSitePlugin()`
`183`	`184`	`return false;`
`184`	`185`	`}`
`185`	`186`
	`187`	`+ if (empty(PRIVATE_SITE_OPTION) \|\| !get_option(PRIVATE_SITE_OPTION)) {`
	`188`	`+ return false;`
	`189`	`+ }`
	`190`	`+`
`186`	`191`	`return true;`
`187`	`192`	`}`
`188`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rrze-legal",`
`3`		`- "version": "2.5.0",`
	`3`	`+ "version": "2.5.1",`
`4`	`4`	`"main": "rrze-legal.php",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "webpack --mode=development --watch",`