sync

diff --git a/AssetTrait.php b/AssetTrait.php
index 9fc559a..b05bbd4 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -239,7 +239,9 @@ trait Pman_Core_AssetTrait {
         
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
+        // isDev set
+        
+        if ((!empty($ff->Pman['isDev']) || $_SERVER['HTTP_HOST'] == 'localhost' )&& !empty($_REQUEST['isDev'])) {
             echo "<!-- CSS compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'css');
             return;

diff --git a/sql/core_email.sql b/sql/core_email.sql
index 2f0cbb1..71b8002 100644 (file)
--- a/sql/core_email.sql
+++ b/sql/core_email.sql
@@ -27,6 +27,10 @@ ALTER TABLE core_email CHANGE COLUMN  in_group to_group_id INT(11) NOT NULL DEFA
 ALTER TABLE core_email CHANGE COLUMN  to_group to_group_id INT(11) NOT NULL DEFAULT -1;
 ALTER TABLE core_email ADD COLUMN    to_group_id INT(11) NOT NULL DEFAULT -1;
 
+-- rather than use 'body... use the original file..'
+ALTER TABLE core_email ADD COLUMN  use_file VARCHAR(254) NOT NULL DEFAULT '';
+
+
 
 UPDATE core_email SET updated_dt = NOW() where updated_dt IS NULL;