diff options
| author | zottel <github@zottel.net> | 2012-03-19 12:32:07 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-19 12:32:07 +0100 |
| commit | 2b3b97df0981c271584c75f43811ca07eb32bafe (patch) | |
| tree | 817dad1559f2b40d8bd082e86af1d8be83ba6ed6 | |
| parent | 6d31e3d6ef56e22ecedccaeb6846b52da501097b (diff) | |
| parent | 2349852b4abd1638624b541f173f51d1fb1ea011 (diff) | |
| download | volse-hubzilla-2b3b97df0981c271584c75f43811ca07eb32bafe.tar.gz volse-hubzilla-2b3b97df0981c271584c75f43811ca07eb32bafe.tar.bz2 volse-hubzilla-2b3b97df0981c271584c75f43811ca07eb32bafe.zip | |
Merge remote branch 'upstream/master'
| -rw-r--r-- | include/text.php | 5 | ||||
| -rwxr-xr-x | mod/photos.php | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 89acbf9fa..a0ff1600e 100644 --- a/include/text.php +++ b/include/text.php @@ -694,8 +694,13 @@ function linkify($s) { if(! function_exists('smilies')) { function smilies($s, $sample = false) { + $a = get_app(); + if(intval(get_config('system','no_smilies')) + || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) + return $s; + $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s); $s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s); diff --git a/mod/photos.php b/mod/photos.php index 4406780d3..b294f0a66 100755 --- a/mod/photos.php +++ b/mod/photos.php @@ -1069,7 +1069,7 @@ function photos_content(&$a) { if($can_post && ($ph[0]['uid'] == $owner_uid)) { $tools = array( 'edit' => array($a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))), - 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'] . '?form_security_token=' . get_form_security_token('profile_photo'), t('Use as profile photo')), + 'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')), ); // lock @@ -1081,6 +1081,17 @@ function photos_content(&$a) { } + if(! $cmd !== 'edit') { + $a->page['htmlhead'] .= '<script> + $(document).keydown(function(event) {' . "\n"; + + if($prevlink) + $a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n"; + if($nextlink) + $a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n"; + $a->page['htmlhead'] .= '});</script>'; + } + if($prevlink) $prevlink = array($prevlink, '<div class="icon prev"></div>') ; |