Changeset 1135

Timestamp:

Apr 8, 2006, 9:42:11 PM (18 years ago)

Author:

rvelices

Message:

merge -r1134 from branches/branch-1_6 into trunk

Location:

trunk

Files:

• include/category_subcats.inc.php (modified) (7 diffs)
• include/functions_tag.inc.php (modified) (7 diffs)
• picture.php (modified) (3 diffs)
• template/yoga/index.tpl (modified) (2 diffs)

trunk/include/category_subcats.inc.php

@@ -133 +133 @@
       get_thumbnail_src($row['path'], @$row['tn_ext']);
   }
-  
+
   if ($conf['subcatify'])
   {
@@ -143 +143 @@
 
     $template->assign_block_vars('categories', array());
-    
+
     foreach ($categories as $category)
     {
@@ -153 +153 @@
           'TITLE' => $lang['hint_category'],
           'ICON'  => get_icon(@$category['date_last']),
-          
+
           'URL' => make_index_url(
             array(
@@ -166 +166 @@
         );
     }
-  
+
     $template->assign_var_from_handle('CATEGORIES', 'mainpage_categories');
   }
@@ -176 +176 @@
     // current row displayed
     $row_number = 0;
-    
+
     foreach ($categories as $category)
     {
@@ -186 +186 @@
           'IMAGE_TITLE' => $lang['hint_category'],
           'IMAGE_TS'    => get_icon(@$category['date_last']),
-          
+
           'U_IMG_LINK'  => make_index_url(
             array(
               'category' => $category['category'],
+              'cat_name' => $category['name'],
               )
             ),
@@ -202 +203 @@
           )
         );
-      
+
       // create a new line ?
       if (++$row_number == $user['nb_image_line'])

trunk/include/functions_tag.inc.php

@@ -55 +55 @@
 ;';
     $image_ids = array_from_query($images_query, 'image_id');
-
+    if ( empty($image_ids) )
+    {
+      return array();
+    }
     $tags_query.= '
   WHERE image_id IN ('.
@@ -64 +67 @@
         ).')';
   }
-  
+
   $tags_query.= '
   GROUP BY tag_id
@@ -70 +73 @@
 
   $result = pwg_query($tags_query);
-  
+
   $tags = array();
 
@@ -94 +97 @@
 ;';
   $result = pwg_query($query);
-  
+
   $tags = array();
 
@@ -124 +127 @@
     return $tags;
   }
-  
+
   $total_count = 0;
 
@@ -147 +150 @@
   {
     $tags[$k]['level'] = 1;
-    
+
     // based on threshold, determine current tag level
     for ($i = $conf['tags_levels'] - 1; $i >= 1; $i--)
@@ -178 +181 @@
       // strategy is to list images associated to each tag
       $tag_images = array();
-      
+
       foreach ($tag_ids as $tag_id)
       {

trunk/picture.php

@@ -631 +631 @@
         )
       );
-  $infos['INFO_CREATION_DATE'] = '<a href="'.$url.'">'.$val.'</a>';
+  $infos['INFO_CREATION_DATE'] = '<a href="'.$url.'" rel="nofollow">'.$val.'</a>';
 }
 else
@@ -648 +648 @@
       )
     );
-$infos['INFO_POSTED_DATE'] = '<a href="'.$url.'">'.$val.'</a>';
+$infos['INFO_POSTED_DATE'] = '<a href="'.$url.'" rel="nofollow">'.$val.'</a>';
 
 // size in pixels
@@ -700 +700 @@
 {
   $tags = array();
-  
+
   while ($row = mysql_fetch_array($result))
   {

trunk/template/yoga/index.tpl

@@ -109 +109 @@
         </p>
     <ul class="actions">
-      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
-      <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
+      <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
+      <li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
     </ul>
 
@@ -152 +152 @@
       <!-- END mode_normal -->
       <!-- BEGIN mode_posted -->
-      <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>
+      <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>
       <!-- END mode_posted -->
       <!-- BEGIN mode_created -->
-      <li><a href="{mode_created.URL}" title="{lang:mode_created_hint}"><img src="{pwg_root}{themeconf:icon_dir}/calendar_created.png" class="button" alt="{lang:mode_created_hint}"></a></li>
+      <li><a href="{mode_created.URL}" title="{lang:mode_created_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar_created.png" class="button" alt="{lang:mode_created_hint}"></a></li>
       <!-- END mode_created -->
     </ul>