diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 13:46:04 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 13:46:04 +0200 |
| commit | b79379f2e598abaa2febb299cdfcebe0a95d034c (patch) | |
| tree | 7098c3a758f606394f4b38d679b5198f8973cffe /inc/cache.php | |
| parent | 73411587cb6d2c54aefebe90c87799c4aa1d31ec (diff) | |
| parent | da9572711f54d13ce3c5506971154b0bc359723f (diff) | |
| download | rpg-b79379f2e598abaa2febb299cdfcebe0a95d034c.tar.gz rpg-b79379f2e598abaa2febb299cdfcebe0a95d034c.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into overridablelangstrings
Conflicts:
inc/plugin.php
Diffstat (limited to 'inc/cache.php')
| -rw-r--r-- | inc/cache.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/cache.php b/inc/cache.php index 7a66049f4..6817e771b 100644 --- a/inc/cache.php +++ b/inc/cache.php @@ -178,6 +178,7 @@ class cache_parser extends cache { public $file = ''; // source file for cache public $mode = ''; // input mode (represents the processing the input file will undergo) + public $page = ''; var $_event = 'PARSER_CACHE_USE'; |