diff options
| author | friendica <info@friendica.com> | 2013-10-28 17:48:42 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-28 17:48:42 -0700 |
| commit | 1380bee82caad1dce6ffda7c35cb4ce3e94911f2 (patch) | |
| tree | bfdd2d502202111c2216ad8ece2a223abc005526 /include | |
| parent | 1bf6591e1b98ef6704ee1bab72bad7dca7ab301f (diff) | |
| download | volse-hubzilla-1380bee82caad1dce6ffda7c35cb4ce3e94911f2.tar.gz volse-hubzilla-1380bee82caad1dce6ffda7c35cb4ce3e94911f2.tar.bz2 volse-hubzilla-1380bee82caad1dce6ffda7c35cb4ce3e94911f2.zip | |
Comanche documentation and some cleanup of layout page (including link to doco) and a few other webpage related cleanups
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 6 | ||||
| -rw-r--r-- | include/conversation.php | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/include/comanche.php b/include/comanche.php index 4b8a1d170..7d7e0e70c 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -46,6 +46,12 @@ function pdl_selector($uid,$current="") { function comanche_parser(&$a,$s) { + $cnt = preg_match_all("/\[comment\](.*?)\[\/comment\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $s = str_replace($mtch[0],'',$s); + } + } $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches); if($cnt) diff --git a/include/conversation.php b/include/conversation.php index 497c2fda7..831a00519 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1072,6 +1072,11 @@ function status_editor($a,$x,$popup=false) { $jotplugins = ''; $jotnets = ''; + + $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); + if(x($x,'nopreview')) + $preview = ''; + call_hooks('jot_tool', $jotplugins); call_hooks('jot_networks', $jotnets); @@ -1080,7 +1085,7 @@ function status_editor($a,$x,$popup=false) { '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$webpage' => $webpage, - '$placeholdpagetitle' => t('Page link title'), + '$placeholdpagetitle' => ((x($x,'ptlabel')) ? $x['ptlabel'] : t('Page link title')), '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$upload' => t('Upload photo'), '$shortupload' => t('upload photo'), @@ -1121,7 +1126,7 @@ function status_editor($a,$x,$popup=false) { '$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : 'yes'), '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], - '$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''), + '$preview' => $preview, '$sourceapp' => t($a->sourcename), '$jotplugins' => $jotplugins, )); |