Merge pull request #434 from shadlaws/fix_controller_auth_test_master

Fix Controller_Auth_Test - T_CURLY_OPEN not parsed as "{".  Update golden file.
This commit is contained in:
Shad Laws 2013-06-26 14:59:04 -07:00
commit 6573fac049
2 changed files with 5 additions and 0 deletions

View File

@ -47,6 +47,10 @@ class Controller_Auth_Test extends Gallery_Unit_Test_Case {
$function = null;
for ($token_number = 0; $token_number < count($tokens); $token_number++) {
$token = $tokens[$token_number];
if (self::_token_matches(array(T_CURLY_OPEN), $tokens, $token_number)) {
// Treat this just like a normal open curly brace
$token = "{";
}
// Count braces.
// 1 open brace = in class context.

View File

@ -37,6 +37,7 @@ modules/tag/controllers/admin_tags.php index
modules/tag/controllers/tag.php __call DIRTY_CSRF|DIRTY_AUTH
modules/tag/controllers/tag_name.php __call DIRTY_AUTH
modules/tag/controllers/tags.php autocomplete DIRTY_CSRF|DIRTY_AUTH
modules/tag/helpers/tag_rss.php feed DIRTY_AUTH
modules/user/controllers/admin_users.php index DIRTY_CSRF
modules/user/controllers/password.php reset DIRTY_AUTH
modules/user/controllers/password.php do_reset DIRTY_CSRF|DIRTY_AUTH