Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Gitignore does not ignore plugins/

  • Loading branch information...
commit 75341f395c1cdeed935a0bbba1a703a526af3ed2 1 parent 75a659c
@klevo authored
Showing with 4 additions and 15 deletions.
  1. +0 −2  .gitignore
  2. +4 −13 wildflower/controllers/components/seo.php
View
2  .gitignore
@@ -21,7 +21,5 @@ vendors/ruckusing/logs/development.log
# HTML webroot cache
app/webroot/cache/*
-app/plugins/*
-
# Local db settings
app/config/database.php.local
View
17 wildflower/controllers/components/seo.php
@@ -33,12 +33,10 @@ function title($pageTitle = null) {
$pageTitle = ucwords($this->controller->params['controller']);
}
- $description = hsc(Configure::read('Wildflower.settings.description'));
- $keywords = hsc(Configure::read('Wildflower.settings.keywords'));
- $credits = Configure::read('Wildflower.settings.credits');
- $homepage_credits = Configure::read('Wildflower.settings.homepage_credits');
- $nameAndDescription = hsc(Configure::read('Wildflower.settings.site_name'));
+ $description = Configure::read('AppSettings.description');
+ $nameAndDescription = hsc(Configure::read('AppSettings.site_name'));
if ($description) {
+ $description = hsc($description);
$nameAndDescription = "$nameAndDescription - {$description}";
}
@@ -46,17 +44,10 @@ function title($pageTitle = null) {
$this->controller->pageTitle = $nameAndDescription;
} else {
$this->controller->pageTitle = "$pageTitle • $nameAndDescription";
- // Uncomment below for homepage only credits
- if($homepage_credits){
- $credits = "";
- }
}
$this->controller->set('page_title_for_layout', $pageTitle);
- $this->controller->set('title_for_layout', $nameAndDescription);
- $this->controller->set('descriptionMetaTag', $description);
- $this->controller->set('keywordsMetaTag', $keywords);
- $this->controller->set('credits', $credits);
+ $this->controller->set('site_title_for_layout', $nameAndDescription);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.