summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-06 17:05:00 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-06 17:05:00 -0800
commit10c05c855a1634a60048a52e8d90bc51f187ede7 (patch)
treeb65a9d3b2f2213503e3f143b18af6ebd831bc554 /modules
parent058a84ed76df96aeb6ec082d16fe0d8f317faac2 (diff)
parentded8fc593cccaf66236fb271a6d3f962d8c4b337 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/tests/controller_auth_data.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index c1fffe6a..beabee49 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -13,7 +13,7 @@ modules/gallery/controllers/login.php ajax
modules/gallery/controllers/login.php auth_ajax DIRTY_AUTH
modules/gallery/controllers/login.php html DIRTY_AUTH
modules/gallery/controllers/login.php auth_html DIRTY_AUTH
-modules/gallery/controllers/logout.php index DIRTY_CSRF|DIRTY_AUTH
+modules/gallery/controllers/logout.php index DIRTY_AUTH
modules/gallery/controllers/maintenance.php index DIRTY_AUTH
modules/gallery/controllers/quick.php form_edit DIRTY_CSRF
modules/gallery/controllers/simple_uploader.php start DIRTY_AUTH