brunoais ac8a4b05b4 [ticket/13146] Fixing what merging broke ...

Merging added content I didn't expect it to add. This fixes back to what it is supposed to be.

PHPBB3-13146

2014-12-03 13:55:53 +00:00

..

auth

Merge pull request #3068 from marc1706/ticket/13204

2014-11-21 22:52:24 +01:00

avatar

Merge pull request #3064 from marc1706/ticket/13197

2014-11-21 22:41:17 +01:00

cache

…

captcha

[ticket/13316] Ensure Recaptcha image uses https when necessary.

2014-11-21 12:17:04 -08:00

config

…

console

[ticket/13211] Move console migrator output handler back to console folder

2014-10-25 12:03:13 -07:00

controller

[ticket/13280] Output escaping for the symfony request object

2014-11-16 16:45:19 +01:00

cron

[ticket/13232] Fix indentation

2014-10-27 15:45:24 -07:00

db

[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php

2014-11-30 11:27:47 +07:00

di

[ticket/13251] Escape container parameters defined from config.php.

2014-11-07 02:30:03 -08:00

event

…

extension

[ticket/security-171] Sanitize data from composer.json

2014-11-21 22:32:28 +01:00

feed

…

groupposition

…

hook

…

lock

…

log

…

message

Merge pull request #3108 from Elsensee/ticket/13284

2014-11-21 23:10:00 +01:00

mimetype

…

notification

[ticket/13337] Allow empty array passed to sql_in_set()

2014-11-14 11:08:35 +01:00

passwords

[ticket/13203] Use string_compare method in passwords drivers

2014-10-22 14:54:55 -05:00

php

…

plupload

…

profilefields

[ticket/13209] Gather language field values for boolean CPF's in all steps.

2014-11-11 16:32:04 -08:00

request

[ticket/13280] Output escaping for the symfony request object

2014-11-16 16:45:19 +01:00

search

…

template

[ticket/13133] Rename $ok variable

2014-11-07 15:57:31 +01:00

tree

…

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

[ticket/13146] Fixing what merging broke

2014-12-03 13:55:53 +00:00

datetime.php

…

error_collector.php

…

file_downloader.php

[ticket/13358] Use protected and public keywords where applicable

2014-11-21 23:30:47 +01:00

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

Merge pull request #8 from phpbb/ticket/security-169

2014-11-22 15:51:48 +01:00

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge pull request #3075 from Senky/ticket/11613

2014-11-26 13:20:36 +01:00

symfony_request.php

[ticket/13280] Output escaping for the symfony request object

2014-11-16 16:45:19 +01:00

user_loader.php

…

user.php

…

version_helper.php

[ticket/13393] Call user->lang function directly

2014-11-27 00:55:01 +01:00

viewonline_helper.php

…