Merge upstream and fix changes.

This commit is contained in:
Daniel Meltzer 2016-06-10 07:44:45 -05:00
parent 9c4c91063f
commit e9605891f3

View file

@ -297,9 +297,8 @@ class AssetsController extends Controller
* @return Redirect
*/
public function postEdit($assetId = null, AssetRequest $request)
public function postEdit(AssetRequest $request, $assetId = null)
{
exit;
// Check if the asset exists
if (!$asset = Asset::find($assetId)) {
// Redirect to the asset management page with error