Skip to content

Commit

Permalink
Merge branch 'release/v1.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
bdaley committed Apr 26, 2017
2 parents 37d0ea5 + 6625e22 commit a7e5db9
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 43 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
}
],
"require": {
"symfony/yaml": "^3.2",
"liquid/liquid": "^1.2"
"liquid/liquid": "^1.2",
"mustangostang/spyc": "^0.6.2"
},
"require-dev": {
"phpunit/phpunit": "^6.1"
Expand Down
61 changes: 28 additions & 33 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uconn-banner",
"version": "1.0.4",
"version": "1.0.5",
"description": "uconn-banner is the official UConn Banner module packaged for quick implementation.",
"license": "UNLICENSED",
"repository": {
Expand Down
14 changes: 7 additions & 7 deletions src/Banner/Banner.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ class Banner {

public function __construct() {

// Load the defaults
$data = file_get_contents(dirname(__FILE__) . '/../../_config.yml');
$settings = \Symfony\Component\Yaml\Yaml::parse($data);
// Load the defaults. See https://packagist.org/packages/mustangostang/spyc
$settings = spyc_load_file(dirname(__FILE__) . '/../../_config.yml');

$this->name = $settings['name'];
$this->department = $settings['department'];
Expand All @@ -39,10 +38,11 @@ public function __get($index){
private function buildVars(){
return array(
'site' => array(
'name' => $this->name,
'department' => $this->department,
'department_url' => $this->url,
'show_header' => $this->header
'name' => $this->name,
'department' => $this->department,
'department_url' => $this->url,
'show_header' => $this->header,
'search' => $this->search
)
);
}
Expand Down

0 comments on commit a7e5db9

Please sign in to comment.