aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Pandey <vishpandey2014@gmail.com>2017-03-14 17:19:41 +0530
committerMarc Alexander <admin@m-a-styles.de>2019-05-08 21:49:10 +0200
commit7d4909dc064b46022020234c7316c86fc0d38a69 (patch)
tree4f568580ca450866330b42b2db5ba35adfd19280
parentcf12223b25ebba131ce2cbe407227ed6abffa949 (diff)
downloadforums-7d4909dc064b46022020234c7316c86fc0d38a69.tar
forums-7d4909dc064b46022020234c7316c86fc0d38a69.tar.gz
forums-7d4909dc064b46022020234c7316c86fc0d38a69.tar.bz2
forums-7d4909dc064b46022020234c7316c86fc0d38a69.tar.xz
forums-7d4909dc064b46022020234c7316c86fc0d38a69.zip
[ticket/11515] Refactoring the patch.
Removing else conditions. PHPBB3-11515
-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;