diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Preview/Movie.php | 2 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index 2f64811b45e..60fe443804a 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -88,8 +88,8 @@ class Movie extends ProviderV2 { if ($returnCode === 0) { $image = new \OC_Image(); $image->loadFromFile($tmpPath); - unlink($tmpPath); if ($image->valid()) { + unlink($tmpPath); $image->scaleDownToFit($maxX, $maxY); return $image; diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index e7809b5a39d..6de6b33172c 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -43,6 +43,7 @@ use OC\Template\JSConfigHelper; use OC\Template\SCSSCacher; use OCP\Defaults; use OC\AppFramework\Http\Request; +use OCP\Support\Subscription\IRegistry; class TemplateLayout extends \OC_Template { @@ -134,7 +135,14 @@ class TemplateLayout extends \OC_Template { parent::__construct('core', 'layout.public'); $this->assign( 'appid', $appId ); $this->assign('bodyid', 'body-public'); - $this->assign('showSimpleSignUpLink', $this->config->getSystemValue('simpleSignUpLink.shown', true) !== false); + + /** @var IRegistry $subscription */ + $subscription = \OC::$server->query(IRegistry::class); + $showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true); + if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) { + $showSimpleSignup = false; + } + $this->assign('showSimpleSignUpLink', $showSimpleSignup); } else { parent::__construct('core', 'layout.base'); |