phpbb/phpBB
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
..
adm Merge branch 'develop-olympus' into develop 2011-07-30 19:37:24 -04:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
docs Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
download Merge branch 'develop-olympus' into develop 2011-06-15 18:51:45 +02:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
install Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
language Merge branch 'develop-olympus' into develop 2011-07-30 19:37:24 -04:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop-olympus' into develop 2011-08-07 16:40:56 -04:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
cron.php [ticket/10046] Remove register_shutdown_function() in cron.php from develop. 2011-03-12 15:07:31 +01:00
faq.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
feed.php [ticket/9684] Remove code for global announcement in root-files 2011-04-07 13:45:44 +02:00
index.php Merge branch 'develop-olympus' into develop 2011-07-16 22:06:49 -04:00
mcp.php [ticket/9684] Remove code for global announcement in root-files 2011-04-07 13:45:44 +02:00
memberlist.php Merge branch 'develop-olympus' into develop 2011-07-16 22:06:49 -04:00
posting.php Merge branch 'develop-olympus' into develop 2011-06-10 00:26:41 +02:00
report.php Merge branch 'develop-olympus' into develop 2011-07-16 22:28:55 -04:00
search.php [ticket/9684] Fix Forum/Topic-Tracking for global announcements 2011-04-07 13:47:08 +02:00
style.php Merge branch 'develop-olympus' into develop 2011-06-15 18:51:45 +02:00
ucp.php Merge branch 'develop-olympus' into develop 2011-05-13 01:29:57 +02:00
viewforum.php Merge branch 'develop-olympus' into develop 2011-07-16 21:57:16 -04:00
viewonline.php [ticket/10290] Fixed malformed SQL query in viewonline.php 2011-08-04 23:16:23 -04:00
viewtopic.php Merge branch 'develop-olympus' into develop 2011-07-30 16:45:37 +02:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00