phpbb/phpBB/includes
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
..
acp [task/whitelist-code-coverage] Load all of includes/ into code coverage report 2011-08-07 20:14:53 -04:00
auth Merge branch 'develop-olympus' into develop 2011-07-05 02:10:03 +02:00
cache Merge branch 'develop-olympus' into develop 2011-06-11 12:06:29 +02:00
captcha Merge branch 'develop-olympus' into develop 2011-06-12 19:27:01 +02:00
config [ticket/10139] Make signatures of set_atomic() consistent by using $new_value. 2011-04-19 10:17:18 +02:00
cron [ticket/10156] Fix new cron on windows. 2011-05-19 22:34:18 -04:00
db [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02:00
diff [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
hooks [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
lock [feature/system-cron] preg_match returns int so cast to bool, fix comment 2011-02-12 22:05:54 -05:00
mcp Merge branch 'develop-olympus' into develop 2011-07-16 21:00:14 -04:00
questionnaire [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
request [feature/request-class] Fix the error message when accessing superglobal 2011-02-28 08:04:40 +01:00
search [ticket/9574] Add pcre_utf8_support() function 2010-12-28 22:37:33 +01:00
template [feature/template-engine] Delete _get_locator function. 2011-08-13 23:49:54 -04:00
ucp Merge branch 'develop-olympus' into develop 2011-06-05 01:58:52 +02:00
utf [ticket/9669] Replace spaces with tabs 2011-03-07 09:49:58 +01:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
auth.php Merge branch 'develop-olympus' into develop 2011-07-16 22:11:32 -04:00
bbcode.php Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
class_loader.php [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests. 2011-01-09 23:49:44 +01:00
constants.php [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. 2011-07-05 00:40:45 +02:00
error_collector.php [ticket/10057] Fixes for a bunch of small problems. 2011-03-08 19:48:56 -05:00
functions.php Merge remote-tracking branch 'github-p/feature/template-engine' into develop 2011-08-13 23:59:15 -04:00
functions_acp.php Merge branch 'develop-olympus' into develop 2011-06-10 01:24:16 +02:00
functions_admin.php Merge branch 'develop-olympus' into develop 2011-07-16 21:00:14 -04:00
functions_compress.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
functions_content.php Merge branch 'develop-olympus' into develop 2011-08-09 21:33:36 -04:00
functions_convert.php Merge branch 'develop-olympus' into develop 2010-12-13 17:14:36 +01:00
functions_display.php Merge branch 'develop-olympus' into develop 2011-07-16 21:57:16 -04:00
functions_download.php [ticket/10258] Add HTML5 meta charset tag 2011-07-29 16:32:22 +02:00
functions_install.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
functions_jabber.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
functions_messenger.php [feature/template-engine] Dependency inject locator into template. 2011-08-09 23:28:40 -04:00
functions_module.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
functions_posting.php Merge branch 'develop-olympus' into develop 2011-06-10 00:26:41 +02:00
functions_privmsgs.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
functions_profile_fields.php Merge branch 'develop-olympus' into develop 2011-06-09 12:47:27 +02:00
functions_transfer.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
functions_upload.php Merge branch 'develop-olympus' into develop 2011-01-10 23:43:04 +01:00
functions_user.php Merge branch 'develop-olympus' into develop 2011-04-10 19:52:58 -04:00
group_positions.php [ticket/9549] New method move() to move a group more than 1 up/down. 2011-02-16 18:22:32 +01:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00
message_parser.php Merge branch 'develop-olympus' into develop 2011-06-09 22:40:26 +02:00
session.php Merge branch 'develop-olympus' into develop 2011-07-07 20:06:26 +02:00
startup.php [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3. 2011-06-25 17:42:52 +02:00