diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/views/kohana_error_disabled.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/views/kohana_error_disabled.php')
| -rw-r--r-- | system/views/kohana_error_disabled.php | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/system/views/kohana_error_disabled.php b/system/views/kohana_error_disabled.php deleted file mode 100644 index cd911328..00000000 --- a/system/views/kohana_error_disabled.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php defined('SYSPATH') OR die('No direct access allowed.'); ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> -<style type="text/css"> -<?php include Kohana::find_file('views', 'kohana_errors', FALSE, 'css') ?> -</style> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> -<title><?php echo $error ?></title> -</head> -<body> -<div id="framework_error" style="width:24em;margin:50px auto;"> -<h3><?php echo html::specialchars($error) ?></h3> -<p style="text-align:center"><?php echo $message ?></p> -</div> -</body> -</html>
\ No newline at end of file |