From: Lukas Reschke Date: Mon, 21 Nov 2016 23:24:23 +0000 (+0100) Subject: Use app ID instead of object X-Git-Tag: v11.0RC2~180^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ee11956da956324b63849002af33c92d5ef931e;p=nextcloud-server.git Use app ID instead of object Fixes several error messages when installing an app from the appstore, including: ``` Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662 Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663 Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661 Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81 trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628 ``` Signed-off-by: Lukas Reschke --- diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php index b378b3c918d..cf1b7f29db5 100644 --- a/settings/ajax/enableapp.php +++ b/settings/ajax/enableapp.php @@ -35,7 +35,7 @@ try { $appId = (string)$_POST['appid']; $appId = OC_App::cleanAppId($appId); $app->enable($appId, $groups); - OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($app)]]); + OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($appId)]]); } catch (Exception $e) { \OCP\Util::writeLog('core', $e->getMessage(), \OCP\Util::ERROR); OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));