aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-02-12 22:12:30 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-02-12 22:12:30 +0100
commit75fa467b7b71926728dd431865b8a2f7fe5d9724 (patch)
treeb01f50caed00a85f2c5280df2fc2d9154a059d9a /phpBB/phpbb
parent0888df9520065da1461bc4b7817d26d52e0f1e6c (diff)
parent1e86f7113339c6b032a4500ce65cf959db97645a (diff)
downloadforums-75fa467b7b71926728dd431865b8a2f7fe5d9724.tar
forums-75fa467b7b71926728dd431865b8a2f7fe5d9724.tar.gz
forums-75fa467b7b71926728dd431865b8a2f7fe5d9724.tar.bz2
forums-75fa467b7b71926728dd431865b8a2f7fe5d9724.tar.xz
forums-75fa467b7b71926728dd431865b8a2f7fe5d9724.zip
Merge remote-tracking branch 'bantu/ticket/12180' into develop
* bantu/ticket/12180: [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/cache/driver/redis.php1
-rw-r--r--phpBB/phpbb/extension/exception.php2
-rw-r--r--phpBB/phpbb/request/deactivated_super_global.php1
3 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/phpbb/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php
index 3c6cb0e138..2b6f9bf36d 100644
--- a/phpBB/phpbb/cache/driver/redis.php
+++ b/phpBB/phpbb/cache/driver/redis.php
@@ -157,4 +157,3 @@ class redis extends \phpbb\cache\driver\memory
return false;
}
}
-
diff --git a/phpBB/phpbb/extension/exception.php b/phpBB/phpbb/extension/exception.php
index b1f4997fdd..82327c9d5e 100644
--- a/phpBB/phpbb/extension/exception.php
+++ b/phpBB/phpbb/extension/exception.php
@@ -18,4 +18,4 @@ class exception extends \UnexpectedValueException
{
return $this->getMessage();
}
-} \ No newline at end of file
+}
diff --git a/phpBB/phpbb/request/deactivated_super_global.php b/phpBB/phpbb/request/deactivated_super_global.php
index b03624593e..b6940cf51f 100644
--- a/phpBB/phpbb/request/deactivated_super_global.php
+++ b/phpBB/phpbb/request/deactivated_super_global.php
@@ -112,4 +112,3 @@ class deactivated_super_global implements \ArrayAccess, \Countable, \IteratorAgg
$this->error();
}
}
-