added array_walk_recursive function to handle multi-dimensional array possibility
korvin said so

not as curt, but not as funky either.
mistakenly sanitized array as csv
Fix Permission Cache Key Collision

Fix permission cache key collision

- Change `PermissionCache::addAccessObject()`
- Change `PermissionCache::clearAccessObject()`
- Change `PermissionCache::getAccessObject()`
- Change `pk:` cache prefix to `pk:` prefix

Collisions occur with `PermissionCache::addValidate()` as both use `pk:`
cache prefix
Merge pull request #1171 from mkly/fix_permission_cache_key_collision

Fix Permission Cache Key Collision
Fix Caching Login Page

Fix Caching Login Page

- Check `canViewPage()` before adding page to full page cache in
  `PageCache::shouldAddToCache()`

Prevents issues where user without view permissions visits page and
caches the /login page. Then when permissions are changed or other
issues user sees /login page when should see actual page
fix 404 on block assets when templates directory exists
Scope and Check `Loader::element()` `$args`

Scope and check `Loader::element()` `$args` before `extract()`

- Change `$file` to `$_file`
- Change `$pkgHandle` to `$_pkgHandle`
- Throw exception if reserved argument names used
add filterBySelectAttribute method to page_list

re-implementation of #190 (taking into account @remo's concerns about performance raised in #184)
use correct constant instead of variable

http://www.concrete5.org/developers/bugs/5-6-1-2/gravatar-size-in-concreteavatarhelperoutputuseravatar/
updated explanatory comment to be more accurate as per @remo
Merge pull request #1175 from Remo/patch-49

use correct constant instead of variable
change helper function from private to protected

so it can be overridden more easily (thanks @mkly)
handle an array of mulitple values
small refactor to make code cleaner
added a bunch of comments, fixed some formatting, improved validation of request parameters
Merge branch 'master' of github.com:concrete5/concrete5
Merge branch 'mlocati:notify-locale-change'

Merge branch 'notify-locale-change'
github.com:mlocati/concrete5
into merge_1109_on_locale_change_event

Conflicts:
	web/concrete/core/libraries/localization.php
Merge pull request #1176 from mkly/merge_1109_on_locale_change_event

Merge 1109 on locale change event
Merge branch 'Mnkras:longer-custom-template-name'

Merge branch 'Mnkras:longer-custom-template-name'
github.com:Mnkras/concrete5
into
merge_1068_max_length_custom_template_name

- Moved from 5.6.1.3 to 5.6.2

Conflicts:
	web/concrete/core/controllers/single_pages/upgrade.php