Merge branch 'master' of github.com:jeena/seinheit.ch

This commit is contained in:
Logsol 2013-07-08 23:57:37 +02:00
commit 8d5a30b335
4 changed files with 17 additions and 7 deletions

View file

@ -34,7 +34,10 @@ class AdminController extends Katharsis_Controller_Abstract
private function getPassword()
{
$admin_ini = parse_ini_file('config/admin.ini');
$path = 'config/admin.ini';
if(!is_readable($path)) die($path . " not found");
$admin_ini = parse_ini_file($path);
$password = $admin_ini["password"];
return $password;

View file

@ -4,7 +4,7 @@
<link rel="stylesheet" type="text/css" href="/style/main.css" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="Description" content="Swiss Didgeridoo Artwork - Online Shop" />
</head>
</head>
<body>
<div style="padding: 10px;">

View file

@ -57,7 +57,7 @@
<article id="stage">
<?php if($this->headerImage): ?>
<img id="header_image" src="<?php echo $this-headerImage ?>" alt="">
<img id="header_image" src="<?php echo $this->headerImage ?>" alt="">
<?php endif ?>
<h1><?php echo Navigation::getTitle(); ?></h1>