diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-01-26 16:53:23 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-01-26 16:53:23 +0000 |
| commit | 3c94d07beba64154ecd707805fa87f2eaf5e4d02 (patch) | |
| tree | 9be7178deadbba10404f3757f776e9eedcf9fe5b /inc/html.php | |
| parent | b5460ee2c820d95f75fd47d2f8bcbe5dddc21e7e (diff) | |
| download | rpg-3c94d07beba64154ecd707805fa87f2eaf5e4d02.tar.gz rpg-3c94d07beba64154ecd707805fa87f2eaf5e4d02.tar.bz2 | |
store choices for recent changes and diff views in cookie (FS#2438 and
FS#2700)
Note: These changes don't work yet. The cookie is not set and deletes the old
one.
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/inc/html.php b/inc/html.php index 5c1c75cf6..444913233 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1088,8 +1088,17 @@ function html_diff($text='',$intro=true,$type=null){ global $REV; global $lang; global $INPUT; + global $INFO; - if(!$type) $type = $INPUT->str('difftype'); + if(!$type) { + $type = $INPUT->str('difftype'); + if (empty($type)) { + $type = get_doku_pref('difftype', $type); + if (empty($type) && $INFO['ismobile']) { + $type = 'inline'; + } + } + } if($type != 'inline') $type = 'sidebyside'; // we're trying to be clever here, revisions to compare can be either |