Skip to content
This repository
Browse code

Gitignore does not ignore plugins/

  • Loading branch information...
commit 75341f395c1cdeed935a0bbba1a703a526af3ed2 1 parent 75a659c
Robert Starsi authored

Showing 2 changed files with 4 additions and 15 deletions. Show diff stats Hide diff stats

  1. +0 2  .gitignore
  2. +4 13 wildflower/controllers/components/seo.php
2  .gitignore
@@ -21,7 +21,5 @@ vendors/ruckusing/logs/development.log
21 21 # HTML webroot cache
22 22 app/webroot/cache/*
23 23
24   -app/plugins/*
25   -
26 24 # Local db settings
27 25 app/config/database.php.local
17 wildflower/controllers/components/seo.php
@@ -33,12 +33,10 @@ function title($pageTitle = null) {
33 33 $pageTitle = ucwords($this->controller->params['controller']);
34 34 }
35 35
36   - $description = hsc(Configure::read('Wildflower.settings.description'));
37   - $keywords = hsc(Configure::read('Wildflower.settings.keywords'));
38   - $credits = Configure::read('Wildflower.settings.credits');
39   - $homepage_credits = Configure::read('Wildflower.settings.homepage_credits');
40   - $nameAndDescription = hsc(Configure::read('Wildflower.settings.site_name'));
  36 + $description = Configure::read('AppSettings.description');
  37 + $nameAndDescription = hsc(Configure::read('AppSettings.site_name'));
41 38 if ($description) {
  39 + $description = hsc($description);
42 40 $nameAndDescription = "$nameAndDescription - {$description}";
43 41 }
44 42
@@ -46,17 +44,10 @@ function title($pageTitle = null) {
46 44 $this->controller->pageTitle = $nameAndDescription;
47 45 } else {
48 46 $this->controller->pageTitle = "$pageTitle • $nameAndDescription";
49   - // Uncomment below for homepage only credits
50   - if($homepage_credits){
51   - $credits = "";
52   - }
53 47 }
54 48
55 49 $this->controller->set('page_title_for_layout', $pageTitle);
56   - $this->controller->set('title_for_layout', $nameAndDescription);
57   - $this->controller->set('descriptionMetaTag', $description);
58   - $this->controller->set('keywordsMetaTag', $keywords);
59   - $this->controller->set('credits', $credits);
  50 + $this->controller->set('site_title_for_layout', $nameAndDescription);
60 51 }
61 52
62 53 }

0 comments on commit 75341f3

Please sign in to comment.
Something went wrong with that request. Please try again.