From 05f1315ebb96b46ea384df73d387aeb05602d2b5 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 8 Jul 2004 22:41:04 +0000 Subject: - remove output buffering options from download.php (not needed anymore) - optimized viewtopic.php a little bit - removed the create_function (was consuming too much memory) from viewtopic - check for manually added convert[.exe] program name to imagemagick path in admin_attachments - reduced filesize checking for imagemagick program (some installations require less than 20k) - added checked="checked" for "not selected" topic icon - moved parse_text_display function from functions_posting.php to functions.php (see comment above function) - check for user_id != ANONYMOUS in page_footer for displaying the administration link (there seems to be a problem checking for global options) - rewrote attachment thumbnail functions - utilize GD2 functions if available, more uptodate checks... - changed final thumbnail size calculation - define S_ROW_COUNT within template class itself - added SID to template vars in page_header - added ability to view topic/forum within admin_viewlogs - added optional acl checking to make_jumpbox, no need to duplicate the function for this small need - added custom body file for confirm_box git-svn-id: file:///svn/phpbb/trunk@4920 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/template.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/template.php') diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 6c90b95b1b..0562324068 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -255,7 +255,7 @@ class template // Assign key variable pairs from an array to a specified block function assign_block_vars($blockname, $vararray) { - if (strstr($blockname, '.')) + if (strpos($blockname, '.') !== false) { // Nested block. $blocks = explode('.', $blockname); @@ -271,6 +271,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. + $vararray['S_ROW_COUNT'] = sizeof($str[$blocks[$blockcount]]); $str[$blocks[$blockcount]][] = &$vararray; } else @@ -278,6 +279,7 @@ class template // Top-level block. // Add a new iteration to this block with the variable assignments // we were given. + $vararray['S_ROW_COUNT'] = sizeof($this->_tpldata[$blockname]); $this->_tpldata[$blockname][] = &$vararray; } -- cgit v1.2.1