Merge pull request #63 from greezybacon/issue/redactor-placeholder-in-draft

Remove placeholder text if found in the draft save

Reviewed-By: Peter Rotich <peter@osticket.com>

js/redactor-osticket.js

@@ -122,6 +122,9 @@ $(function() {
                   .attr('height',img.clientHeight);
             html = html.replace(before, img.outerHTML);
         });
+        // Drop the placeholder text if found in the box
+        // DELME: When this is fixed upstream in Redactor
+        html = html.replace(/<span class="redactor_placeholder[^<]+<\/span>/, '');
         return html;
     },
     redact = function(el) {

setup/cli/modules/deploy.php

@@ -127,7 +127,9 @@ class Deployment extends Unpacker {
             // Clean everything but include folder first
             $this->clean($root, $this->destination, -1,
                 array($include, "setup/"));
-            $this->clean("$root/include", $include, -1);
+            $this->clean("$root/include", $include, -1,
+                array("ost-config.php","settings.php","plugins/",
+                "*/.htaccess"));
         }
     }
 }