Merge pull request #52 from werkbot/hotfix/2.1.6/revert-change

Removed check for Show/Hide setting on shortcode
werkbot · May 30, 2024 · f339fc3 · f339fc3
2 parents f46e285 + 51cf36c
commit f339fc3
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/NewsletterShortcodeProvider.php b/src/NewsletterShortcodeProvider.php
@@ -5,29 +5,29 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\View\Parsers\ShortcodeParser;
 
-class NewsletterShortcodeProvider extends ShortcodeParser{
+class NewsletterShortcodeProvider extends ShortcodeParser
+{
   /*
     [newsletterform,class="form newsletter-form"]
   */
-  public static function handle_shortcode($args, $content, $parser, $shortcode, $extra = array()){
+  public static function handle_shortcode($args, $content, $parser, $shortcode, $extra = array())
+  {
     $PopupContent = '';
     // Add Content before form
-    if ($content){
+    if ($content) {
       $PopupContent = $parser->parse($content);
     }
     // If class add wrapper div
-    if (isset($args['class'])){
-      $PopupContent .= '<div class="'.$args['class'].'">';
+    if (isset($args['class'])) {
+      $PopupContent .= '<div class="' . $args['class'] . '">';
     }
     // Get Form HTML
-    if (Controller::curr()->owner->NewsletterShowHide){
-      $PopupContent .= Controller::curr()->NewsletterForm()
-        ->setHTMLID("NewsletterForm".rand(0,100))
-        ->setFormAction(Controller::join_links(Controller::curr()->owner->Link(), 'NewsletterForm'))
-        ->forTemplate();
-    }
+    $PopupContent .= Controller::curr()->NewsletterForm()
+      ->setHTMLID("NewsletterForm" . rand(0, 100))
+      ->setFormAction(Controller::join_links(Controller::curr()->owner->Link(), 'NewsletterForm'))
+      ->forTemplate();
     // End wrapper div
-    if (isset($args['class'])){
+    if (isset($args['class'])) {
       $PopupContent .= '</div>';
     }
     // Return full html