kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-07 21:30:48 +00:00
Code Issues Projects Releases Wiki Activity

Reinstated test data seeder, fixed the tests.

Browse Source
This commit is contained in:
James Cole
2015-01-17 10:41:29 +01:00
parent 9e2b34bc12
commit bd11ec69fa
3 changed files with 570 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/UserController.php
View File

@@ -78,7 +78,7 @@ class UserController extends BaseController
if ($user) {
$result = $email->sendVerificationMail($user);
if ($result === false) {
if ($result === false && Config::get('mail.pretend') === false) {
$user->delete();
return View::make('error')->with('message', 'The email message could not be send. See the log files.');
@@ -126,7 +126,9 @@ class UserController extends BaseController
*/
public function register()
{
if (Config::get('mail.from.address') == '@gmail.com' || Config::get('mail.from.address') == '') {
if ((Config::get('mail.from.address') == '@gmail.com' || Config::get('mail.from.address') == '')
&& Config::get('mail.pretend') === false
) {
return View::make('error')->with('message', 'Configuration error in <code>app/config/' . App::environment() . '/mail.php</code>');
}