diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:25 +0200 |
| commit | 75b6545bc271f4e488cf8dc7708a871e4c7dc446 (patch) | |
| tree | aca90d9f76ba75db4daf1cec04e755757dae53e6 /phpBB/includes/functions_upload.php | |
| parent | 973dfbf868f2c75c02ae7cdff0056ecf9c665d70 (diff) | |
| parent | dec6c7ea8cd147e41a9095a77c1af41480dff654 (diff) | |
| download | forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.gz forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.bz2 forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.xz forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.zip | |
Merge pull request #3040 from nickvergessen/ticket/13138-asc
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id
Conflicts:
phpBB/phpbb/session.php
Diffstat (limited to 'phpBB/includes/functions_upload.php')
0 files changed, 0 insertions, 0 deletions