|
Marc
|
99eeb52b763fb2efb2e5dad2b39c06b2be8c74b5
99eeb52b763fb2efb2e5dad2b39c06b2be8c74b5 |
Merge pull request #3050 from prototech/ticket/13070
[ticket/13070] Adjust template hook name to match that provided in the class. |
|
|
Cesar G <prototech91@gmail.com>
|
b9b15b700736769b79ccb8f41265bea548877f45
b9b15b700736769b79ccb8f41265bea548877f45 |
[ticket/13070] Adjust template hook name to match that provided in the class.
PHPBB3-13070 |
|
|
|
Andreas Fischer <bantu@phpbb.com>
|
b71cf56bda9413afaad2933bd5d09eb80c3a19bc
m b71cf56bda9413afaad2933bd5d09eb80c3a19bc |
Merge pull request #3047 from Elsensee/ticket/13168
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
* Elsensee/ticket/13168:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility |
|
|
|
Andreas Fischer <bantu@phpbb.com>
|
afada9ed409ca7abdb2dc95c10d1cac3aacf86a6
afada9ed409ca7abdb2dc95c10d1cac3aacf86a6 |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility |
|
|
Joas Schilling
|
75b6545bc271f4e488cf8dc7708a871e4c7dc446
75b6545bc271f4e488cf8dc7708a871e4c7dc446 |
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 |
|
