Skip to content

[stable17] Do not show 'Get your own free account' on services under subscription #17748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Oct 30, 2019
Merged

[stable17] Do not show 'Get your own free account' on services under subscription #17748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Do not show 'Get your own free account' on services under subscription 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer authored and Backportbot committed Oct 30, 2019
commit bc6442c46b6e6ff923ef4ab8d872668b08e647d9
10 changes: 9 additions & 1 deletion lib/private/TemplateLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
use OC\Template\SCSSCacher;
use OCP\Defaults;
use OC\AppFramework\Http\Request;
use OCP\Support\Subscription\IRegistry;

class TemplateLayout extends \OC_Template {

Expand Down Expand Up @@ -134,7 +135,14 @@ public function __construct( $renderAs, $appId = '' ) {
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');

Expand Down