do not translate hidden photo album 'Contact Photos' as it may become unhidden when...

diff --git a/include/Photo.php b/include/Photo.php
index 707b0de5d8c3af8ea8ac849690ad644fb8180fae..de4c3d9e0439c11aa30dbbc3ad32b5f6e15c7d6f 100644 (file)
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -230,21 +230,21 @@ function import_profile_photo($photo,$uid,$cid) {
                                        
                $hash = photo_new_resource();
 
-               $r = $img->store($uid, $cid, $hash, $filename, t('Contact Photos'), 4 );
+               $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
 
                if($r === false)
                        $photo_failure = true;
 
                $img->scaleImage(80);
 
-               $r = $img->store($uid, $cid, $hash, $filename, t('Contact Photos'), 5 );
+               $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
 
                if($r === false)
                        $photo_failure = true;
 
                $img->scaleImage(48);
 
-               $r = $img->store($uid, $cid, $hash, $filename, t('Contact Photos'), 6 );
+               $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
 
                if($r === false)
                        $photo_failure = true;

diff --git a/include/items.php b/include/items.php
index 63e180f7611f8482f67ca139eb44f7d14eb6fc28..4f6030e5ae0fd2c1b1ccbfc2f3d3c803ff032daf 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1072,13 +1072,13 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                        $img->scaleImageSquare(175);
                                
                        $hash = $resource_id;
-                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 4);
+                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 4);
                                
                        $img->scaleImage(80);
-                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 5);
+                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 5);
 
                        $img->scaleImage(48);
-                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 6);
+                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 6);
 
                        $a = get_app();
 

diff --git a/mod/photos.php b/mod/photos.php
index 28ed609b58078e9b0ecf2c6bf59cb1dc7f1ef267..2cd4e262282552c706c64bd06aa95473774def18 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -35,7 +35,11 @@ function photos_init(&$a) {
                
                        $o .= '<ul>';
                        foreach($albums as $album) {
-                               if((! strlen($album['album'])) || ($album['album'] == t('Contact Photos')))
+
+                               // don't show contact photos. We once trasnlated this name, but then you could still access it under
+                               // a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
+
+                               if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
                                        continue;
                                $o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" />' . $album['album'] . '</a></li>'; 
                        }
@@ -133,7 +137,7 @@ function photos_post(&$a) {
        if(($a->argc > 3) && ($a->argv[2] === 'album')) {
                $album = hex2bin($a->argv[3]);
 
-               if($album == t('Profile Photos') || $album == t('Contact Photos')) {
+               if($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
                        goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
                        return; // NOTREACHED
                }
@@ -878,7 +882,7 @@ function photos_content(&$a) {
                $albumselect .= '<option value="" selected="selected" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                if(count($a->data['albums'])) {
                        foreach($a->data['albums'] as $album) {
-                               if(($album['album'] === '') || ($album['album'] == t('Contact Photos')))
+                               if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
                                        continue;
                                $albumselect .= '<option value="' . $album['album'] . '">' . $album['album'] . '</option>';
                        }
@@ -947,7 +951,7 @@ function photos_content(&$a) {
                $o .= '<h3>' . $album . '</h3>';
                
                if($cmd === 'edit') {           
-                       if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
+                       if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
                                if($can_post) {
                                        $edit_tpl = get_markup_template('album_edit.tpl');
                                        $o .= replace_macros($edit_tpl,array(
@@ -962,7 +966,7 @@ function photos_content(&$a) {
                        }
                }
                else {
-                       if(($album != t('Profile Photos')) && ($album != t('Contact Photos'))) {
+                       if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
                                if($can_post) {
                                        $o .= '<div id="album-edit-link"><a href="'. $a->get_baseurl() . '/photos/' 
                                                . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit' . '">' 
@@ -1348,9 +1352,10 @@ function photos_content(&$a) {
        // Default - show recent photos with upload link (if applicable)
        //$o = '';
 
-       $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' 
+       $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
                $sql_extra GROUP BY `resource-id`",
                intval($a->data['user']['uid']),
+               dbesc('Contact Photos'),
                dbesc( t('Contact Photos'))
        );
        if(count($r)) {
@@ -1359,9 +1364,10 @@ function photos_content(&$a) {
        }
 
        $r = q("SELECT `resource-id`, `id`, `filename`, `album`, max(`scale`) AS `scale` FROM `photo`
-               WHERE `uid` = %d AND `album` != '%s' 
+               WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'  
                $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
                intval($a->data['user']['uid']),
+               dbesc('Contact Photos'),
                dbesc( t('Contact Photos')),
                intval($a->pager['start']),
                intval($a->pager['itemspage'])