|
Andreas Fischer <bantu@phpbb.com>
|
1e4853507abb3fc50d6d7edd048d3cf88e905f1c
1e4853507abb3fc50d6d7edd048d3cf88e905f1c |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus: |
|
|
Andreas Fischer <bantu@phpbb.com>
|
8832851b8e29c9a1969f61c8b8c82ef33639f34d
8832851b8e29c9a1969f61c8b8c82ef33639f34d |
Merge pull request #3366 from marc1706/ticket/13348
[ticket/13348] Use close method to free feed query result handle
* marc1706/ticket/13348:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle |
|
|
Andreas Fischer <bantu@phpbb.com>
|
2787e799e17ee1358246087fe44ecf7ca9c4f9ed
2787e799e17ee1358246087fe44ecf7ca9c4f9ed |
Merge pull request #3365 from marc1706/ticket/13348-olympus
[ticket/13348] Use close method to free query result handle
* marc1706/ticket/13348-olympus:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle |
|
|
Marc
|
a09d022d5e50263d131711cdf936e6a4f690069b
a09d022d5e50263d131711cdf936e6a4f690069b |
Merge branch 'ticket/13348-olympus' into ticket/13348
Conflicts:
phpBB/feed.php |
|
|
Marc
|
4e06ab16f008a48944f1dfde1d06394126e54541
4e06ab16f008a48944f1dfde1d06394126e54541 |
[ticket/13348] Remove unnecessary global $cache
$cache is not used in the method get_item().
PHPBB3-13348 |
|