diff options
| author | David King <imkingdavid@gmail.com> | 2012-03-30 19:34:08 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-03-30 19:34:08 -0400 |
| commit | 4f97cc12951b2be6fa8d7962beaf631f7c82fb43 (patch) | |
| tree | dcc2bdda5fd3368eedd3e42056e8de31d7de4b02 /phpBB | |
| parent | 0f93e0c719373452d9d0ac9fd2ab1dfe6f3b41aa (diff) | |
| parent | 162f9b738aaa74684ea42e3ce4d6a911a183a996 (diff) | |
| download | forums-4f97cc12951b2be6fa8d7962beaf631f7c82fb43.tar forums-4f97cc12951b2be6fa8d7962beaf631f7c82fb43.tar.gz forums-4f97cc12951b2be6fa8d7962beaf631f7c82fb43.tar.bz2 forums-4f97cc12951b2be6fa8d7962beaf631f7c82fb43.tar.xz forums-4f97cc12951b2be6fa8d7962beaf631f7c82fb43.zip | |
Merge remote-tracking branch 'cyberalien/feature/purge-cache' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 11f7fedd38..63ca3a1c79 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -194,13 +194,14 @@ <dd><input type="hidden" name="action" value="purge_sessions" /><input class="button2" type="submit" id="action_purge_sessions" name="action_purge_sessions" value="{L_RUN}" /></dd> </dl> </form> + <!-- ENDIF --> + <form id="action_purge_cache_form" method="post" action="{U_ACTION}"> <dl> <dt><label for="action_purge_cache">{L_PURGE_CACHE}</label><br /><span>{L_PURGE_CACHE_EXPLAIN}</span></dt> <dd><input type="hidden" name="action" value="purge_cache" /><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{L_RUN}" /></dd> </dl> </form> - <!-- ENDIF --> </fieldset> <!-- ENDIF --> diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 88c29702d4..4c9ee85982 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -330,11 +330,6 @@ class acp_main break; case 'purge_cache': - if ((int) $user->data['user_type'] !== USER_FOUNDER) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - global $cache; $cache->purge(); |