From bbed467385ecb73f9e41714eeabb6c85b2652e5c Mon Sep 17 00:00:00 2001
From: Barbara Bothe <barbara.bothe@fau.de>
Date: Thu, 14 Jun 2018 14:23:58 +0200
Subject: [PATCH] Anpassung RRZE-Elements

---
 .gitignore               | 4 ++++
 functions/shortcodes.php | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ac2fc1b9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+
+nbproject/project.properties
+/nbproject/private/
+nbproject/project.xml
diff --git a/functions/shortcodes.php b/functions/shortcodes.php
index 9bbc69f4..f21f35fd 100644
--- a/functions/shortcodes.php
+++ b/functions/shortcodes.php
@@ -22,7 +22,9 @@ function add_shortcodes() {
             // Paragraphes and content regions
             add_shortcode('hr', array( $this, 'fau_hr'));
             // Old Shortcodes for downwards compatibility
-            add_shortcode('alert', array( $this, 'absatzklasse_attention' ));
+            if ( !is_plugin_active( 'rrze-elements/rrze-elements.php' ) ) {
+                add_shortcode('alert', array( $this, 'absatzklasse_attention' ));
+            }
             add_shortcode('attention', array( $this, 'absatzklasse_attention' ));
             add_shortcode('hinweis', array( $this, 'absatzklasse_hinweis' ));
             add_shortcode('baustelle', array( $this, 'absatzklasse_baustelle' ));
@@ -50,7 +52,9 @@ function add_shortcodes() {
 
 
             // Ported and adapted by old bootstrap code
-            add_shortcode('button', array( $this, 'bs_button' ));    
+            if ( !is_plugin_active( 'rrze-elements/rrze-elements.php' ) ) {
+                add_shortcode('button', array( $this, 'bs_button' ));
+            }
             add_shortcode('code', array( $this, 'bs_code' ));
             add_shortcode('span', array( $this, 'bs_span' ));
             add_shortcode('row', array( $this, 'bs_row' ));