aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acm/acm_main.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-01-05 12:10:31 +0000
committerNils Adermann <naderman@naderman.de>2006-01-05 12:10:31 +0000
commit717424444680049eb0e2956486bcc149fe5cd851 (patch)
tree6108ed72507e5a32b1359810fe379c88b7df9f4d /phpBB/includes/acm/acm_main.php
parent636ab0f5ea0fb55d8cafa8aea55babae2f7c7e34 (diff)
downloadforums-717424444680049eb0e2956486bcc149fe5cd851.tar
forums-717424444680049eb0e2956486bcc149fe5cd851.tar.gz
forums-717424444680049eb0e2956486bcc149fe5cd851.tar.bz2
forums-717424444680049eb0e2956486bcc149fe5cd851.tar.xz
forums-717424444680049eb0e2956486bcc149fe5cd851.zip
- acm::exists() is considered private now and was renamed to acm::_exists()
git-svn-id: file:///svn/phpbb/trunk@5425 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm/acm_main.php')
-rw-r--r--phpBB/includes/acm/acm_main.php37
1 files changed, 11 insertions, 26 deletions
diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php
index a0e6267b53..3f9e3fa60f 100644
--- a/phpBB/includes/acm/acm_main.php
+++ b/phpBB/includes/acm/acm_main.php
@@ -72,11 +72,7 @@ class cache extends acm
return false;
}
- if ($this->exists('word_censors'))
- {
- $censors = $this->get('word_censors');
- }
- else
+ if (!($censors = $this->get('word_censors')))
{
$sql = 'SELECT word, replacement
FROM ' . WORDS_TABLE;
@@ -101,11 +97,7 @@ class cache extends acm
*/
function obtain_icons(&$icons)
{
- if ($this->exists('icons'))
- {
- $icons = $this->get('icons');
- }
- else
+ if (!($icons = $this->get('icons')))
{
global $db;
@@ -136,11 +128,7 @@ class cache extends acm
*/
function obtain_ranks(&$ranks)
{
- if ($this->exists('ranks'))
- {
- $ranks = $this->get('ranks');
- }
- else
+ if (!($ranks = $this->get('ranks')))
{
global $db;
@@ -181,11 +169,7 @@ class cache extends acm
*/
function obtain_attach_extensions(&$extensions, $forum_id = false)
{
- if ($this->exists('_extensions'))
- {
- $extensions = $this->get('_extensions');
- }
- else
+ if (!($extensions = $this->get('_extensions')))
{
global $db;
@@ -265,11 +249,7 @@ class cache extends acm
*/
function obtain_bots(&$bots)
{
- if ($this->exists('bots'))
- {
- $bots = $this->get('bots');
- }
- else
+ if (!($bots = $this->get('bots')))
{
global $db;
@@ -320,7 +300,12 @@ class cache extends acm
foreach ($parsed_items as $key => $parsed_array)
{
- $parsed_array = ($this->exists('_' . $key . '_cfg')) ? $this->get('_' . $key . '_cfg') : array();
+ $parsed_array = $this->get('_' . $key . '_cfg');
+
+ if (!$parsed_array)
+ {
+ $parsed_array = array();
+ }
$reparse = false;
$filename = $phpbb_root_path . 'styles/' . $theme[$key . '_path'] . '/' . $key . '/' . $key . '.cfg';