aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/phpbb/config/config.php5
-rw-r--r--phpBB/phpbb/lock/db.php6
-rw-r--r--phpBB/phpbb/lock/flock.php5
3 files changed, 3 insertions, 13 deletions
diff --git a/phpBB/phpbb/config/config.php b/phpBB/phpbb/config/config.php
index 0a867342f5..f4b670e834 100644
--- a/phpBB/phpbb/config/config.php
+++ b/phpBB/phpbb/config/config.php
@@ -164,10 +164,7 @@ class config implements \ArrayAccess, \IteratorAggregate, \Countable
{
return true;
}
- else
- {
- throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.');
- }
+ throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.');
}
/**
diff --git a/phpBB/phpbb/lock/db.php b/phpBB/phpbb/lock/db.php
index d9ad4d3b97..eea919f8f7 100644
--- a/phpBB/phpbb/lock/db.php
+++ b/phpBB/phpbb/lock/db.php
@@ -117,11 +117,7 @@ class db
return true;
}
}
- else
- {
-
- return $this->locked;
- }
+ return $this->locked;
}
/**
diff --git a/phpBB/phpbb/lock/flock.php b/phpBB/phpbb/lock/flock.php
index b496ed845e..fa4cbe3690 100644
--- a/phpBB/phpbb/lock/flock.php
+++ b/phpBB/phpbb/lock/flock.php
@@ -105,10 +105,7 @@ class flock
{
return (bool) $this->lock_fp;
}
- else
- {
- throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.');
- }
+ throw new \phpbb\exception\http_exception(500, 'Failure while aqcuiring locks.');
}
return (bool) $this->lock_fp;