From 425cdc586315531b94a49112455980d969343491 Mon Sep 17 00:00:00 2001 From: Travis Swientek Date: Mon, 22 Jul 2013 22:24:08 -0700 Subject: [PATCH] "Broke something in the last commit, fixed it here" --- src/Mailgun/Common/BatchMessage.php | 2 +- src/Mailgun/Common/Client.php | 2 +- src/Mailgun/Common/globals.php | 12 ------------ test.php | 6 +++--- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 src/Mailgun/Common/globals.php diff --git a/src/Mailgun/Common/BatchMessage.php b/src/Mailgun/Common/BatchMessage.php index 8fe308d..61e99e1 100644 --- a/src/Mailgun/Common/BatchMessage.php +++ b/src/Mailgun/Common/BatchMessage.php @@ -4,7 +4,7 @@ namespace Mailgun\Common; -require_once 'Globals.php'; +require dirname(__DIR__) . '/globals.php'; use Guzzle\Http\Client as Guzzler; use Mailgun\Exceptions\NoDomainsConfigured; diff --git a/src/Mailgun/Common/Client.php b/src/Mailgun/Common/Client.php index e3c3337..e677f4a 100644 --- a/src/Mailgun/Common/Client.php +++ b/src/Mailgun/Common/Client.php @@ -2,7 +2,7 @@ namespace Mailgun\Common; -require_once 'globals.php'; +require dirname(__DIR__) . '/globals.php'; use Guzzle\Http\Client as Guzzler; diff --git a/src/Mailgun/Common/globals.php b/src/Mailgun/Common/globals.php deleted file mode 100644 index 56400a9..0000000 --- a/src/Mailgun/Common/globals.php +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/test.php b/test.php index 6b9c1c4..785bdf2 100644 --- a/test.php +++ b/test.php @@ -1,7 +1,7 @@ "travis@aawdawdad.ninomail.com", 'to' => "travis@tswientek.com", "subject" => "subject here", "text" => "hello", "o:testmode" =>true)); +//$message = new Message(); -$response = $client->sendMessage($message->getMessage()); +$response = $client->sendMessage(array('from' =>"travis@aawdawdad.ninomail.com", 'to' => "travis@tswientek.com", "subject" => "subject here", "text" => "hello", "o:testmode" =>true)); echo $response->getBody();