shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
denisdulici 2018-07-05 16:56:09 +03:00
commit 672159eafc
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Settings/Modules.php
View File

@ -22,7 +22,7 @@ class Modules extends Controller
return $s; return $s;
})->pluck('value', 'key'); })->pluck('value', 'key');
$module = Module::get($alias); $module = Module::findByAlias($alias);
return view('settings.modules.edit', compact('setting', 'module')); return view('settings.modules.edit', compact('setting', 'module'));
} }

7
app/Traits/Modules.php
View File

@ -373,8 +373,13 @@ trait Modules
$response = $this->getRemote($url, 'GET', ['timeout' => 30, 'referer' => true]); $response = $this->getRemote($url, 'GET', ['timeout' => 30, 'referer' => true]);
// Exception
if ($response instanceof RequestException) {
return false;
}
// Bad response // Bad response
if ($response->getStatusCode() != 200) { if (!$response || ($response->getStatusCode() != 200)) {
return false; return false;
} }

4
app/Utilities/Updater.php
View File

@ -70,7 +70,7 @@ class Updater
} }
} else { } else {
// Get module instance // Get module instance
$module = Module::get($alias); $module = Module::findByAlias($alias);
$model = Model::where('alias', $alias)->first(); $model = Model::where('alias', $alias)->first();
// Move all files/folders from temp path // Move all files/folders from temp path
@ -114,7 +114,7 @@ class Updater
return false; return false;
} }
if ($response->getStatusCode() == 200) { if ($response && ($response->getStatusCode() == 200)) {
$file = $response->getBody()->getContents(); $file = $response->getBody()->getContents();
} }

4
app/Utilities/Versions.php
View File

@ -99,7 +99,7 @@ class Versions
} }
// Bad response // Bad response
if ($response->getStatusCode() != 200) { if (!$response || ($response->getStatusCode() != 200)) {
return $latest; return $latest;
} }
@ -115,4 +115,4 @@ class Versions
return $latest; return $latest;
} }
} }

6
config/version.php
View File

@ -10,15 +10,15 @@ return [
'minor' => '2', 'minor' => '2',
'patch' => '9', 'patch' => '10',
'build' => '', 'build' => '',
'status' => 'Stable', 'status' => 'Stable',
'date' => '27-June-2018', 'date' => '2-July-2018',
'time' => '20:30', 'time' => '19:30',
'zone' => 'GMT +3', 'zone' => 'GMT +3',