Merge pull request #94 from RRZE-Webteam/dev

rvdforst · web-flow · commit c284d2a79936 · 2023-08-10T09:25:21.000+02:00
Dev
diff --git a/includes/Consent/Frontend.php b/includes/Consent/Frontend.php
@@ -184,7 +184,7 @@ public static function rrzePrivateSitePlugin()
             return false;
         }
 
-        if (empty(PRIVATE_SITE_OPTION) || !get_option(PRIVATE_SITE_OPTION)) {
+        if (!defined('PRIVATE_SITE_OPTION') || !get_option(PRIVATE_SITE_OPTION)) {
             return false;
         }
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rrze-legal",
-    "version": "2.6.14",
+    "version": "2.6.16",
     "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.6.15
+Version:         2.6.16
 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
`@@ -184,7 +184,7 @@ public static function rrzePrivateSitePlugin()`
`184`	`184`	`return false;`
`185`	`185`	`}`
`186`	`186`
`187`		`- if (empty(PRIVATE_SITE_OPTION) \|\| !get_option(PRIVATE_SITE_OPTION)) {`
	`187`	`+ if (!defined('PRIVATE_SITE_OPTION') \|\| !get_option(PRIVATE_SITE_OPTION)) {`
`188`	`188`	`return false;`
`189`	`189`	`}`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rrze-legal",`
`3`		`- "version": "2.6.14",`
	`3`	`+ "version": "2.6.16",`
`4`	`4`	`"main": "rrze-legal.php",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "webpack --mode=development --watch",`