diff options
| -rwxr-xr-x | boot.php | 4 | ||||
| -rw-r--r-- | include/comanche.php | 1 | ||||
| -rw-r--r-- | mod/cover_photo.php | 19 |
3 files changed, 20 insertions, 4 deletions
@@ -2004,12 +2004,14 @@ function load_pdl(&$a) { $arr = array('module' => $a->module, 'layout' => ''); call_hooks('load_pdl',$arr); - $s = $arr['layout']; + $layout = $arr['layout']; $n = 'mod_' . $a->module . '.pdl' ; $u = comanche_get_channel_id(); if($u) $s = get_pconfig($u, 'system', $n); + if(! $s) + $s = $layout; if((! $s) && (($p = theme_include($n)) != '')) $s = @file_get_contents($p); diff --git a/include/comanche.php b/include/comanche.php index ca3ad336b..ddf331321 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -275,6 +275,7 @@ function comanche_widget($name, $text) { $vars = array(); $matches = array(); + $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $text, $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { diff --git a/mod/cover_photo.php b/mod/cover_photo.php index 832d5ad8e..de11857b0 100644 --- a/mod/cover_photo.php +++ b/mod/cover_photo.php @@ -68,6 +68,14 @@ function cover_photo_post(&$a) { $srcW = $_POST['xfinal'] - $srcX; $srcH = $_POST['yfinal'] - $srcY; + + $r = q("select gender from profile where uid = %d and is_default = 1 limit 1", + intval(local_channel()) + ); + if($r) { + $profile = $r[0]; + } + $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND scale = 0 LIMIT 1", dbesc($image_id), intval(local_channel()) @@ -148,7 +156,7 @@ function cover_photo_post(&$a) { } $channel = $a->get_channel(); - send_cover_photo_activity($channel,$base_image); + send_cover_photo_activity($channel,$base_image,$profile); } @@ -203,7 +211,7 @@ function cover_photo_post(&$a) { } -function send_cover_photo_activity($channel,$photo) { +function send_cover_photo_activity($channel,$photo,$profile) { $arr = array(); $arr['item_thread_top'] = 1; @@ -218,7 +226,12 @@ function send_cover_photo_activity($channel,$photo) { 'link' => array('rel' => 'photo', 'type' => $photo['type'], 'href' => z_root() . '/photo/' . $photo['resource_id'] . '-7') )); - $t = t('%1$s updated their %2$s'); + if($profile && stripos($profile['gender'],t('female')) !== false) + $t = t('%1$s updated her %2$s'); + elseif($profile && stripos($profile['gender'],t('male')) !== false) + $t = t('%1$s updated his %2$s'); + else + $t = t('%1$s updated their %2$s'); $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]'; |