Remove unused jot.tpl template variables

diff --git a/include/conversation.php b/include/conversation.php
index 64c8228ff919c5c9d9115e7c36b457333315288c..14b1f548f82f4a30ee84c68c14c84c7a28b344ad 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1137,28 +1137,11 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
        $jotplugins = '';
        Hook::callAll('jot_tool', $jotplugins);
 
-       // Private/public post links for the non-JS ACL form
-       $private_post = 1;
-       if (!empty($_REQUEST['public'])) {
-               $private_post = 0;
-       }
-
        $query_str = DI::args()->getQueryString();
        if (strpos($query_str, 'public=1') !== false) {
                $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
        }
 
-       /*
-        * I think $a->query_string may never have ? in it, but I could be wrong
-        * It looks like it's from the index.php?q=[etc] rewrite that the web
-        * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
-        */
-       if (strpos($query_str, '?') === false) {
-               $public_post_link = '?public=1';
-       } else {
-               $public_post_link = '&public=1';
-       }
-
        // $tpl = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
        $tpl = Renderer::getMarkupTemplate("jot.tpl");
 
@@ -1212,11 +1195,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 
                // ACL permissions box
                '$acl'           => $x['acl'],
-               '$group_perms'   => DI::l10n()->t('Post to Groups'),
-               '$contact_perms' => DI::l10n()->t('Post to Contacts'),
-               '$private'       => DI::l10n()->t('Private post'),
-               '$is_private'    => $private_post,
-               '$public_link'   => $public_post_link,
 
                //jot nav tab (used in some themes)
                '$message' => DI::l10n()->t('Message'),

diff --git a/mod/photos.php b/mod/photos.php
index b00663df3a95dab359d2308dcdb9a03033455b09..65e8651b20f514a87c37fa6b4e17efae20297365 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -987,8 +987,6 @@ function photos_content(App $a)
                        '$uploadurl' => $ret['post_url'],
 
                        // ACL permissions box
-                       '$group_perms' => DI::l10n()->t('Show to Groups'),
-                       '$contact_perms' => DI::l10n()->t('Show to Contacts'),
                        '$return_path' => DI::args()->getQueryString(),
                ]);
 
@@ -1352,8 +1350,6 @@ function photos_content(App $a)
                                '$delete' => DI::l10n()->t('Delete Photo'),
 
                                // ACL permissions box
-                               '$group_perms' => DI::l10n()->t('Show to Groups'),
-                               '$contact_perms' => DI::l10n()->t('Show to Contacts'),
                                '$return_path' => DI::args()->getQueryString(),
                        ]);
                }