diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-12 23:19:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-12 23:19:55 +0000 |
| commit | 9988679d567a8bba9bade92dd9524bb012a1fe43 (patch) | |
| tree | 72da21e7465fed3ca99f20bd809a3df9c020530d /phpBB/includes/template.php | |
| parent | f4cfd3665f7cf1ed96ce4c2eca03ac6854aae258 (diff) | |
| download | forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar.gz forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar.bz2 forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar.xz forums-9988679d567a8bba9bade92dd9524bb012a1fe43.zip | |
- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)
- use getenv instead of $_ENV (with $_ENV the case could be wrong)
- permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently)
- implemented max login attempts
- changed the expected return parameters for logins/sessions
- added acp page for editing report/denial reasons
- other fixes here and there
git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/template.php')
| -rw-r--r-- | phpBB/includes/template.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index a67de99e03..b592181a35 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -314,7 +314,7 @@ class template // Now we add the block that we're actually assigning to. // We're adding a new iteration to this block with the given // variable assignments. - $str[$blocks[$blockcount]][] = &$vararray; + $str[$blocks[$blockcount]][] = $vararray; } else { @@ -337,7 +337,7 @@ class template // Add a new iteration to this block with the variable assignments // we were given. - $this->_tpldata[$blockname][] = &$vararray; + $this->_tpldata[$blockname][] = $vararray; } return true; @@ -349,7 +349,7 @@ class template * Some Examples: * <code> * - * alter_block_array('loop', $varrarray); // Insert vararray at the end + * alter_block_array('loop', $vararray); // Insert vararray at the beginning * alter_block_array('loop', $vararray, 2); // Insert vararray at position 2 * alter_block_array('loop', $vararray, array('KEY' => 'value')); // Insert vararray at the position where the key 'KEY' has the value of 'value' * alter_block_array('loop', $vararray, false); // Insert vararray at first position @@ -447,7 +447,7 @@ class template // Insert vararray at given position $vararray['S_ROW_COUNT'] = $key; - $this->_tpldata[$blockname][$key] = &$vararray; + $this->_tpldata[$blockname][$key] = $vararray; return true; } @@ -460,7 +460,7 @@ class template $key--; } - $this->_tpldata[$blockname][$key] = array_merge($this->_tpldata[$blockname][$key], &$vararray); + $this->_tpldata[$blockname][$key] = array_merge($this->_tpldata[$blockname][$key], $vararray); return true; } } |