From 1cd3b4182595b838a535dd6b6990251db05d49e6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 30 Mar 2016 22:13:24 -0700 Subject: deprecate $a->get_baseurl() --- mod/editpost.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/editpost.php') diff --git a/mod/editpost.php b/mod/editpost.php index 030d8d671..7555ef37c 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -47,7 +47,7 @@ function editpost_content(&$a) { $channel = $a->get_channel(); $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$pretext' => '', '$ispublic' => ' ', // t('Visible to everybody'), @@ -132,7 +132,7 @@ function editpost_content(&$a) { '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, '$parent' => (($itm[0]['parent'] != $itm[0]['id']) ? $itm[0]['parent'] : ''), - '$baseurl' => $a->get_baseurl(), + '$baseurl' => z_root(), '$defloc' => $channel['channel_location'], '$visitor' => false, '$public' => t('Public post'), -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- mod/editpost.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mod/editpost.php') diff --git a/mod/editpost.php b/mod/editpost.php index 7555ef37c..dffc9c0da 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -44,9 +44,9 @@ function editpost_content(&$a) { // if(feature_enabled(local_channel(),'richtext')) // $plaintext = false; - $channel = $a->get_channel(); + $channel = App::get_channel(); - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( + App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => z_root(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$pretext' => '', @@ -101,7 +101,7 @@ function editpost_content(&$a) { } } - $cipher = get_pconfig(get_app()->profile['profile_uid'],'system','default_cipher'); + $cipher = get_pconfig(App::$profile['profile_uid'],'system','default_cipher'); if(! $cipher) $cipher = 'aes256'; @@ -148,12 +148,12 @@ function editpost_content(&$a) { '$profile_uid' => $owner_uid, '$preview' => t('Preview'), '$jotplugins' => $jotplugins, - '$sourceapp' => t($a->sourcename), + '$sourceapp' => t(App::$sourcename), '$catsenabled' => $catsenabled, '$defexpire' => datetime_convert('UTC', date_default_timezone_get(),$itm[0]['expires']), - '$feature_expire' => ((feature_enabled(get_app()->profile['profile_uid'],'content_expire') && (! $webpage)) ? true : false), + '$feature_expire' => ((feature_enabled(App::$profile['profile_uid'],'content_expire') && (! $webpage)) ? true : false), '$expires' => t('Set expiration date'), - '$feature_encrypt' => ((feature_enabled(get_app()->profile['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false), + '$feature_encrypt' => ((feature_enabled(App::$profile['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, '$expiryModalOK' => t('OK'), -- cgit v1.2.3 From 5d884c2f3dddabb475e4246fc9837e1ac3b5750f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 1 Apr 2016 00:59:30 -0700 Subject: suddenly we have includepath issues - provide the explicit paths --- mod/editpost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/editpost.php') diff --git a/mod/editpost.php b/mod/editpost.php index dffc9c0da..a433d91f4 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -1,6 +1,6 @@