[ticket/12557] Fix doc block errors found by Sami

More corrections.

PHPBB3-12557
[ticket/12557] Fix doc block errors found by Sami

Merge branch 'ticket/12557' into ticket/12557ascraeus
This is the merge of the second commit of 'ticket/12557'.

Resolved Conflicts:
	phpBB/phpbb/search/base.php

PHPBB3-12557
[ticket/12557] Fix doc block errors found by Sami

More corrections.

PHPBB3-12557