Nils Adermann 6fa83ba876 Merge remote-tracking branch 'github-p/feature/template-engine' into develop ... * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php		2011-08-13 23:59:15 -04:00
..
add_permissions.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_avatars.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_bbcodes.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_magic_urls.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_sizes.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_smilies.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_uids.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
adjust_usernames.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
benchmark.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
calc_email_hash.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
change_smiley_ref.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
check_flash_bbcodes.php	[ticket/9903] Script for detecting potentially malicious flash bbcodes	2010-11-19 11:31:00 +01:00
collect_cache_stats.sh	Copy 3.0.x branch to trunk	2009-10-04 18:14:59 +00:00
compile_template.php	[feature/template-engine] Rename template_compile methods for clarity.	2011-05-04 00:07:58 -04:00
create_schema_files.php	Merge branch 'develop-olympus' into develop	2011-07-05 01:07:22 +02:00
create_variable_overview.php	[ticket/10258] Change the DOCTYPE to HTML5	2011-07-09 17:04:46 +02:00
fill.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
fix_files.sh	exclude the image file with text in the name from having newlines fixed	2010-03-05 22:22:39 +01:00
generate_utf_casefold.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
generate_utf_confusables.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
generate_utf_tables.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
lang_duplicates.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
merge_attachment_tables.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
merge_post_tables.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
mysql_upgrader.php	Merge branch 'develop-olympus' into develop	2011-05-23 23:59:56 +02:00
nuke-db.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
regex.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
remove-php-end-tags.py	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
repair_bots.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
search_fill.php	Copy 3.0.x branch to trunk	2009-10-04 18:14:59 +00:00
set_permissions.sh	[task/set-permissions] shell script to set file permissions	2010-06-28 18:12:56 +02:00
unicode_testing.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
update_email_hash.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
utf_normalizer_test.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00