aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/modules
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-12-24 14:44:19 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-12-24 14:44:19 +0000
commit3cd007c49d776b4e76f939dbd7d7c328bd09abe9 (patch)
tree287c795585bd490712255b17d0962ce5e838c36b /phpBB/modules
parentac37f87105173ae50c357c96ffee43ef4d4b41f5 (diff)
downloadforums-3cd007c49d776b4e76f939dbd7d7c328bd09abe9.tar
forums-3cd007c49d776b4e76f939dbd7d7c328bd09abe9.tar.gz
forums-3cd007c49d776b4e76f939dbd7d7c328bd09abe9.tar.bz2
forums-3cd007c49d776b4e76f939dbd7d7c328bd09abe9.tar.xz
forums-3cd007c49d776b4e76f939dbd7d7c328bd09abe9.zip
change cache:: to phpbb_cache::
git-svn-id: file:///svn/phpbb/trunk@9226 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules')
-rw-r--r--phpBB/modules/acp/acp_styles.php2
-rw-r--r--phpBB/modules/mcp/mcp_forum.php2
-rw-r--r--phpBB/modules/mcp/mcp_post.php2
-rw-r--r--phpBB/modules/mcp/mcp_queue.php2
-rw-r--r--phpBB/modules/mcp/mcp_reports.php10
-rw-r--r--phpBB/modules/mcp/mcp_topic.php2
-rw-r--r--phpBB/modules/ucp/ucp_pm_viewfolder.php2
-rw-r--r--phpBB/modules/ucp/ucp_pm_viewmessage.php2
8 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/modules/acp/acp_styles.php b/phpBB/modules/acp/acp_styles.php
index 03abe01dbc..dc366a1ff6 100644
--- a/phpBB/modules/acp/acp_styles.php
+++ b/phpBB/modules/acp/acp_styles.php
@@ -1660,7 +1660,7 @@ parse_css_file = {PARSE_CSS_FILE}
$theme_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['theme_name'], $style_row['theme_copyright'], $config['version']), $this->theme_cfg);
// Read old cfg file
- $items = cache::obtain_cfg_item($style_row, 'theme');
+ $items = phpbb_cache::obtain_cfg_item($style_row, 'theme');
if (!isset($items['parse_css_file']))
{
diff --git a/phpBB/modules/mcp/mcp_forum.php b/phpBB/modules/mcp/mcp_forum.php
index ef28d5efd0..547ed00da3 100644
--- a/phpBB/modules/mcp/mcp_forum.php
+++ b/phpBB/modules/mcp/mcp_forum.php
@@ -134,7 +134,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
));
// Grab icons
- $icons = cache::obtain_icons();
+ $icons = phpbb_cache::obtain_icons();
$topic_rows = array();
diff --git a/phpBB/modules/mcp/mcp_post.php b/phpBB/modules/mcp/mcp_post.php
index 5717242541..9cb5b2cdae 100644
--- a/phpBB/modules/mcp/mcp_post.php
+++ b/phpBB/modules/mcp/mcp_post.php
@@ -140,7 +140,7 @@ function mcp_post_details($id, $mode, $action)
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
- $extensions = cache::obtain_attach_extensions($post_info['forum_id']);
+ $extensions = phpbb_cache::obtain_extensions_forum($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
diff --git a/phpBB/modules/mcp/mcp_queue.php b/phpBB/modules/mcp/mcp_queue.php
index 0db75dd268..2fa80602fe 100644
--- a/phpBB/modules/mcp/mcp_queue.php
+++ b/phpBB/modules/mcp/mcp_queue.php
@@ -140,7 +140,7 @@ class mcp_queue
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
- $extensions = cache::obtain_attach_extensions($post_info['forum_id']);
+ $extensions = phpbb_cache::obtain_extensions_forum($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
diff --git a/phpBB/modules/mcp/mcp_reports.php b/phpBB/modules/mcp/mcp_reports.php
index 7e6bae1dc1..63d145eb49 100644
--- a/phpBB/modules/mcp/mcp_reports.php
+++ b/phpBB/modules/mcp/mcp_reports.php
@@ -149,7 +149,7 @@ class mcp_reports
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
- $extensions = cache::obtain_attach_extensions($post_info['forum_id']);
+ $extensions = phpbb_cache::obtain_extensions_forum($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
@@ -425,7 +425,7 @@ class mcp_reports
'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start),
'TOPIC_ID' => $topic_id,
'TOTAL' => $total,
- 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
+ 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
)
);
@@ -610,13 +610,13 @@ function close_report($report_id_list, $mode, $action)
$messenger->send($reporter['user_notify_type']);
}
}
-
+
foreach ($post_info as $post)
{
$forum_ids[$post['forum_id']] = $post['forum_id'];
$topic_ids[$post['topic_id']] = $post['topic_id'];
}
-
+
unset($notify_reporters, $post_info, $reports);
$messenger->save_queue();
@@ -648,7 +648,7 @@ function close_report($report_id_list, $mode, $action)
{
$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 't=' . current($topic_ids) . '&amp;f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
-
+
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
}
}
diff --git a/phpBB/modules/mcp/mcp_topic.php b/phpBB/modules/mcp/mcp_topic.php
index bd1bc4f659..7da6891c07 100644
--- a/phpBB/modules/mcp/mcp_topic.php
+++ b/phpBB/modules/mcp/mcp_topic.php
@@ -171,7 +171,7 @@ function mcp_topic_view($id, $mode, $action)
$extensions = $attachments = array();
if ($topic_info['topic_attachment'] && sizeof($post_id_list))
{
- $extensions = cache::obtain_attach_extensions($topic_info['forum_id']);
+ $extensions = phpbb_cache::obtain_extensions_forum($topic_info['forum_id']);
// Get attachments...
if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id']))
diff --git a/phpBB/modules/ucp/ucp_pm_viewfolder.php b/phpBB/modules/ucp/ucp_pm_viewfolder.php
index 36750d69c4..67db920b2b 100644
--- a/phpBB/modules/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/modules/ucp/ucp_pm_viewfolder.php
@@ -33,7 +33,7 @@ function view_folder($id, $mode, $folder_id, $folder)
$user->add_lang('viewforum');
// Grab icons
- $icons = cache::obtain_icons();
+ $icons = phpbb_cache::obtain_icons();
$color_rows = array('marked', 'replied');
diff --git a/phpBB/modules/ucp/ucp_pm_viewmessage.php b/phpBB/modules/ucp/ucp_pm_viewmessage.php
index 8b249ab66a..e6e34efbfa 100644
--- a/phpBB/modules/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/modules/ucp/ucp_pm_viewmessage.php
@@ -46,7 +46,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
}
// Grab icons
- $icons = cache::obtain_icons();
+ $icons = phpbb_cache::obtain_icons();
$bbcode = false;