diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteLogo.php b/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteLogo.php
index 3c40c83..2981fba 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteLogo.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteLogo.php
@@ -20,12 +20,12 @@
class PageSiteLogo extends BlockBase {
/**
- * Implements BlockInterface::build().
+ * Overrides \Drupal\block\BlockBase::blockBuild().
*/
- public function build() {
+ public function blockBuild() {
$logo = theme_get_setting('logo');
if (!empty($logo)) {
- $image = '';
+ $image = '';
return array(
'#children' => l($image, '', array('html' => TRUE, 'attributes' => array('rel' => 'home', 'id' => 'logo', 'title' => t('Home')))),
);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteName.php b/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteName.php
index 187e05f..750efb0 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteName.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteName.php
@@ -20,9 +20,9 @@
class PageSiteName extends BlockBase {
/**
- * Implements BlockInterface::build().
+ * Overrides \Drupal\block\BlockBase::blockBuild().
*/
- public function build() {
+ public function blockBuild() {
return array(
'#children' => filter_xss_admin(config('system.site')->get('name')),
);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteSlogan.php b/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteSlogan.php
index 3ed5fef..ed843c3 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteSlogan.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/PageSiteSlogan.php
@@ -20,10 +20,11 @@
class PageSiteSlogan extends BlockBase {
/**
- * Implements BlockInterface::build().
+ * Overrides \Drupal\block\BlockBase::blockBuild().
*/
- public function build() {
- if (theme_get_setting('toggle_slogan')) {
+ public function blockBuild() {
+ $slogan = theme_get_setting('features.slogan');
+ if ($slogan) {
$slogan = config('system.site')->get('slogan');
if (!empty($slogan)) {
return array(