fixes to wiki parsing search, a=chris

diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php
index 425771bc5..b8b032e01 100644
--- a/src/controllers/components/SocialComponent.php
+++ b/src/controllers/components/SocialComponent.php
@@ -1415,13 +1415,15 @@ class SocialComponent extends Component implements CrawlConstants
             $user_id = C\PUBLIC_USER_ID;
         }
         $search_translation = tl('social_component_search');
+        $base_url = C\BASE_URL;
         $search_form = <<<EOD
 <form method="get" class="search-box $2-search-box" >
 <input type='hidden' name="its" value='$1' />
 <input type='text'  name='q'  value="" placeholder='$3'
     title='$3' class='search-input' />
 <button type="submit" class='search-button'><img
-    src='./resources/search-button.png'  alt='$search_translation'/></button>
+    src='{$base_url}resources/search-button.png'
+    alt='$search_translation'/></button>
 </form>
 EOD;
         $additional_substitutions[] = ['/{{\s*search\s*:\s*(.+?)\s*\|'.
diff --git a/src/library/WikiParser.php b/src/library/WikiParser.php
index e697bf6ff..d81c393f8 100644
--- a/src/library/WikiParser.php
+++ b/src/library/WikiParser.php
@@ -70,7 +70,7 @@ class WikiParser implements CrawlConstants
         $minimal = false)
     {
         $esc = $this->esc;
-        $not_braces = '[^\}\{]*';
+        $not_braces = '(?:[^\}]|\}[^\}])*';
         $not_paragraph = '(?:\A|[^\n]|[^\n]\n)';
         $class_or_id = '0-9a-zA-Z\_\-\s';
         $this->minimal = $minimal;
@@ -194,7 +194,7 @@ class WikiParser implements CrawlConstants
         ];
         $braces_substitutions = [
             ['/'.$not_paragraph.'{{\s*class\s*\=\s*'.
-                "&quot;([$class_or_id]+)&quot;\s+()}}/",
+                "&quot;([$class_or_id]+)&quot;\s+(".$not_braces .")}}/",
                 "$esc<span class=\"$1\" >\t\n$2$esc</span>\t"],
             ['/'.$not_paragraph.'{{\s*class\s*\=\s*'.
                 "&#039;([$class_or_id]+)&#039;\s+(".$not_braces .")}}/",
diff --git a/src/models/GroupModel.php b/src/models/GroupModel.php
index 88d33180e..d5466f0e8 100644
--- a/src/models/GroupModel.php
+++ b/src/models/GroupModel.php
@@ -1205,7 +1205,7 @@ class GroupModel extends Model implements MediaConstants
         } elseif (!$create) {
             return false;
         }
-        if (!file_exists(APP_DIR) && !mkdir(C\APP_DIR)) {
+        if (!file_exists(C\APP_DIR) && !mkdir(C\APP_DIR)) {
             return false;
         }
         if (!file_exists($resource_path) && !mkdir($resource_path)) {