diff options
| author | friendica <info@friendica.com> | 2015-03-11 01:03:30 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-11 01:03:30 -0700 |
| commit | a40c19d19d31bba3fe037a9778c521461e2b0290 (patch) | |
| tree | 8c09cefac7bfb25360c19f212b02b0f46a79480e /include | |
| parent | bfd123c59a61be1d667648263aa44c4a9e14a5fc (diff) | |
| parent | 0014cf4ff232328c3e3d0993eb8e9893a7c16f54 (diff) | |
| download | volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.tar.gz volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.tar.bz2 volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.zip | |
Merge branch 'master' into openid
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | include/photos.php | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 6b8cb941f..aa6641ca2 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -864,7 +864,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); - $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm#](.*?)\>/ism",'<$1$2="">',$Text); + $Text = preg_replace("/\<(.*?)(src|href)=\"[^zhfm#](.*?)\>/ism",'<$1$2="">',$Text); $Text = bb_replace_images($Text,$saved_images); diff --git a/include/photos.php b/include/photos.php index 4841e649d..c2f5ed4ba 100644 --- a/include/photos.php +++ b/include/photos.php @@ -34,29 +34,11 @@ function photo_upload($channel, $observer, $args) { $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y-m'); } - /** - * - * We create a wall item for every photo, but we don't want to - * overwhelm the data stream with a hundred newly uploaded photos. - * So we will make the first photo uploaded to this album in the last several hours - * visible by default, the rest will become visible over time when and if - * they acquire comments, likes, dislikes, and/or tags - * - */ - - $r = q("SELECT * FROM photo WHERE album = '%s' AND uid = %d AND created > %s - INTERVAL %s ", - dbesc($album), - intval($channel_id), - db_utcnow(), db_quoteinterval('3 HOUR') - ); - if((! $r) || ($album == t('Profile Photos'))) + if(intval($args['visible']) || $args['visible'] === 'true') $visible = 1; else $visible = 0; - if(intval($args['visible']) || $args['visible'] === 'true') - $visible = 1; - $str_group_allow = perms2str(((is_array($args['group_allow'])) ? $args['group_allow'] : explode(',',$args['group_allow']))); $str_contact_allow = perms2str(((is_array($args['contact_allow'])) ? $args['contact_allow'] : explode(',',$args['contact_allow']))); $str_group_deny = perms2str(((is_array($args['group_deny'])) ? $args['group_deny'] : explode(',',$args['group_deny']))); |