summaryrefslogtreecommitdiff
path: root/inc/html.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/html.php')
-rw-r--r--inc/html.php11
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