diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-18 23:24:13 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-18 23:24:13 +0200 |
| commit | 2731e5a456a6d3da0b8926f63b2a4d440bfe439e (patch) | |
| tree | 6ea3439496aacea16b5197bf16d26f1c716e5232 /phpBB/includes/diff/diff.php | |
| parent | bf5d453479ed572692209b7acf71f3e9c0e97cc7 (diff) | |
| parent | 94fead702a450dbbd25b58d68d132a9e476bae44 (diff) | |
| download | forums-2731e5a456a6d3da0b8926f63b2a4d440bfe439e.tar forums-2731e5a456a6d3da0b8926f63b2a4d440bfe439e.tar.gz forums-2731e5a456a6d3da0b8926f63b2a4d440bfe439e.tar.bz2 forums-2731e5a456a6d3da0b8926f63b2a4d440bfe439e.tar.xz forums-2731e5a456a6d3da0b8926f63b2a4d440bfe439e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10369] Replace root path with "[ROOT]" as per IRC.
[ticket/10369] Add warning about paths outside of phpBB root not being filtered
[ticket/10369] Rename filter_errfile() to filter_root_path().
[ticket/10369] DRY code to remove phpbb path from errfile.
[ticket/10369] Always include errfile and errline in format_errors().
Diffstat (limited to 'phpBB/includes/diff/diff.php')
0 files changed, 0 insertions, 0 deletions