diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-02-03 13:26:12 -0800 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-02-03 13:26:12 -0800 |
| commit | 2509b6f19785d4c179c3957c17bdde2e2e9d0149 (patch) | |
| tree | 4ab13af08e8d769e6ef2931579eae282cc0fff49 /inc/html.php | |
| parent | 6ecd102555022984aa926a4d423a98c775a06ca4 (diff) | |
| parent | 646a531a33fe5c5e32a932e2a889c43702505c48 (diff) | |
| download | rpg-2509b6f19785d4c179c3957c17bdde2e2e9d0149.tar.gz rpg-2509b6f19785d4c179c3957c17bdde2e2e9d0149.tar.bz2 | |
Merge pull request #164 from splitbrain/diff_recent_prefs
store choices for recent changes and diff views in cookie
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 c8b96cbc0..a48f18bff 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 |