Merge branch 'master' of github.com:LIN3S/WordpressStandard

* 'master' of github.com:LIN3S/WordpressStandard: Readded mailer class Updated Mailer configuration Removed Acf from theme kernel Updated theme
LIN3S · Jun 7, 2016 · 3631db7 · 3631db7
2 parents 1cb0316 + 7ac2074
commit 3631db7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "johnpbloch/wordpress":                           "^4.5",
         "lin3s/cs":                                       "^0.3.6",
         "lin3s/lin3s-distribution":                       "^1.2.1",
-        "lin3s/wp-foundation":                            "^1.5.0",
+        "lin3s/wp-foundation":                            "^1.6.0",
         "lin3s/wp-routing":                               "^1.0.3",
         "lin3s/template-selector":                        "^1.0",
         "timber/timber":                                  "^1.0",

diff --git a/wp-config-custom-sample.php b/wp-config-custom-sample.php
@@ -36,13 +36,12 @@
 define('LOGGED_IN_SALT',     'Put your unique phrase here');
 define('NONCE_SALT',         'Put your unique phrase here');
 
-define('MAILER_HOST',        'smtp.mandrillapp.com');
-define('MAILER_PORT',        587);
-define('MAILER_USERNAME',    'Put the username here');
-define('MAILER_PASSWORD',    'Put the password here');
-define('MAILER_TO',          'The receiver email address');
-define('MAILER_FROM',        'The email address that will be shown to the receiver');
-define('MAILER_FROM_NAME',   'The name that will be shown to the receiver');
+define('MAILER_SMTP',        false);
+define('MAILER_HOST',        'localhost'); // ex: smtp.sparkpostmail.com
+define('MAILER_PORT',        25); // ex: 587
+define('MAILER_USERNAME',    ''); // ex: SMTP_Injection
+define('MAILER_PASSWORD',    '');
+define('MAILER_TRANSPORT',   ''); // ex. tls
 
 define('TRANSLATION_DOMAIN', 'Put your translation domain');
 define('XMLRPC_ENABLED', false);