summaryrefslogtreecommitdiffstats
path: root/application/views
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-01 16:33:58 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-01 16:33:58 +0100
commitc5536aac5752054f7f76e448d58b86407d8f574e (patch)
tree6983129569e65a7744323a57d786b53433c5c746 /application/views
parent1a9b7e0d1f96b3cee5692f582d860dca4978dee5 (diff)
Manually apply PR #1594 (fixing phpdoc page-level generation/warnings)
Also partially fixes issue #1295, fixes inconsistencies in some page-level docblocks and adds include checks in language files.
Diffstat (limited to 'application/views')
-rw-r--r--application/views/errors/error_404.php3
-rw-r--r--application/views/errors/error_db.php3
-rw-r--r--application/views/errors/error_general.php3
-rw-r--r--application/views/errors/error_php.php3
-rw-r--r--application/views/welcome_message.php3
5 files changed, 10 insertions, 5 deletions
diff --git a/application/views/errors/error_404.php b/application/views/errors/error_404.php
index fe48fd524..4a8823dee 100644
--- a/application/views/errors/error_404.php
+++ b/application/views/errors/error_404.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
diff --git a/application/views/errors/error_db.php b/application/views/errors/error_db.php
index 76ca6df7a..21d5d86ef 100644
--- a/application/views/errors/error_db.php
+++ b/application/views/errors/error_db.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
diff --git a/application/views/errors/error_general.php b/application/views/errors/error_general.php
index e9baf1665..5bf361113 100644
--- a/application/views/errors/error_general.php
+++ b/application/views/errors/error_general.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>
diff --git a/application/views/errors/error_php.php b/application/views/errors/error_php.php
index b76dc8a9e..c0c4bd622 100644
--- a/application/views/errors/error_php.php
+++ b/application/views/errors/error_php.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?>
<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index d227f82d1..27332f456 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
/**
* CodeIgniter
*
@@ -24,6 +24,7 @@
* @since Version 1.0
* @filesource
*/
+defined('BASEPATH') OR exit('No direct script access allowed');
?><!DOCTYPE html>
<html lang="en">
<head>