diff options
author | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
commit | c4221f32738dac51f691d5be1bebd2b50318521e (patch) | |
tree | e353242b42ca2942d7fe6d29888568c8bfe821ee /mod/webpages.php | |
parent | 6679734135fb04f4a7beccb81663bf1e9574f062 (diff) | |
parent | 2376d2140ab6eeb8a44d7582a52978520844e229 (diff) | |
download | volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2 volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip |
Merge branch 'master' into tres
Conflicts:
include/notifier.php
Diffstat (limited to 'mod/webpages.php')
-rw-r--r-- | mod/webpages.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/webpages.php b/mod/webpages.php index 7dead3371..e04cbdc11 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -113,7 +113,8 @@ function webpages_content(&$a) { 'profile_uid' => intval($owner), 'mimetype' => $mimetype, 'layout' => $layout, - 'expanded' => true + 'expanded' => true, + 'novoting' => true ); if($_REQUEST['title']) @@ -149,7 +150,6 @@ function webpages_content(&$a) { 'type' => 'webpage', 'title' => $rr['title'], 'body' => $rr['body'], - 'term' => $rr['term'], 'created' => $rr['created'], 'edited' => $rr['edited'], 'mimetype' => $rr['mimetype'], |