diff options
-rw-r--r-- | inc/RemoteAPICore.php | 4 | ||||
-rw-r--r-- | lib/scripts/toolbar.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index fef0b81dd..81b211ec8 100644 --- a/inc/RemoteAPICore.php +++ b/inc/RemoteAPICore.php @@ -3,7 +3,7 @@ /** * Increased whenever the API is changed */ -define('DOKU_API_VERSION', 7); +define('DOKU_API_VERSION', 8); class RemoteAPICore { @@ -344,6 +344,8 @@ class RemoteAPICore { for($i=0; $i<$len; $i++) { unset($data[$i]['meta']); + $data[$i]['perms'] = $data[$i]['perm']; + unset($data[$i]['perm']); $data[$i]['lastModified'] = $this->api->toDate($data[$i]['mtime']); } return $data; diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 04d30c1a6..059a4ba5c 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -94,7 +94,7 @@ function tb_format(btn, props, edid) { * @author Andreas Gohr <andi@splitbrain.org> */ function tb_formatln(btn, props, edid) { - var sample = props.title || props.sample, + var sample = props.sample || props.title, opts, selection = getSelection(jQuery('#'+edid)[0]); |