aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-07-11 11:58:53 +0200
committerMario Vavti <mario@mariovavti.com>2015-07-11 11:58:53 +0200
commit54bb2651f54af121297f69b1e3baa632dc64c449 (patch)
treee61d877cb545c0c798ccd4ed218317a114f5776b
parentb1f926ba893cadad2a7fdbf14bdccafbfefdbbe6 (diff)
parenta497d8ee66edcb6e0c29e8e16c875963d497334d (diff)
downloadvolse-hubzilla-54bb2651f54af121297f69b1e3baa632dc64c449.tar.gz
volse-hubzilla-54bb2651f54af121297f69b1e3baa632dc64c449.tar.bz2
volse-hubzilla-54bb2651f54af121297f69b1e3baa632dc64c449.zip
merge
-rw-r--r--mod/display.php5
-rw-r--r--version.inc2
2 files changed, 5 insertions, 2 deletions
diff --git a/mod/display.php b/mod/display.php
index b23f7f374..b2d9ba34b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -64,10 +64,13 @@ function display_content(&$a, $update = 0, $load = false) {
'bang' => '',
'visitor' => true,
'profile_uid' => local_channel(),
- 'return_path' => 'channel/' . $channel['channel_address']
+ 'return_path' => 'channel/' . $channel['channel_address'],
+ 'expanded' => true
);
+ $o = '<div id="jot-popup">';
$o .= status_editor($a,$x);
+ $o .= '</div>';
}
diff --git a/version.inc b/version.inc
index fe5a631ad..3310f4f5f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-06.1085
+2015-07-10.1089