diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-04 12:03:05 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-04 12:03:05 +0000 |
| commit | 07f6a6b5f3092f53304be24e43ad2b92912ae5c3 (patch) | |
| tree | 77a4f718df92085dd6a0579266c9bc82016c8e58 /phpBB/includes/template.php | |
| parent | 92f554e38aaf3c4d280c201d3a6521e519acfb47 (diff) | |
| download | forums-07f6a6b5f3092f53304be24e43ad2b92912ae5c3.tar forums-07f6a6b5f3092f53304be24e43ad2b92912ae5c3.tar.gz forums-07f6a6b5f3092f53304be24e43ad2b92912ae5c3.tar.bz2 forums-07f6a6b5f3092f53304be24e43ad2b92912ae5c3.tar.xz forums-07f6a6b5f3092f53304be24e43ad2b92912ae5c3.zip | |
- fixed database updater
- fixed hook function call in database updater
- fixed bot agent detection (we used a wildcard within the w3c-agent, therefore we should really support this. ;))
git-svn-id: file:///svn/phpbb/trunk@8131 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/template.php')
| -rw-r--r-- | phpBB/includes/template.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 4c126b8a91..2e60beb658 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -1,14 +1,15 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ * @copyright (c) 2005 phpBB Group, sections (c) 2001 ispi of Lincoln Inc -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** +* @ignore */ if (!defined('IN_PHPBB')) { @@ -149,7 +150,7 @@ class template { global $user, $phpbb_hook; - if ($phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once)) + if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once)) { if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__))) { @@ -408,10 +409,10 @@ class template * * If key is false the position is set to 0 * If key is true the position is set to the last entry - * + * * @param string $mode Mode to execute (valid modes are 'insert' and 'change') * - * If insert, the vararray is inserted at the given position (position counting from zero). + * If insert, the vararray is inserted at the given position (position counting from zero). * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value). * * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array) |