Changeset 3647

Timestamp:

Jul 20, 2009, 10:18:25 PM (15 years ago)

Author:

tiico

Message:

Re-add "lost" code from 0.3.5 (choose rank order for the rss feed)

Location:

extensions/piclens

Files:

• CHANGELOG (modified) (1 diff)
• admin/rssfeed.php (modified) (1 diff)
• generate_rss.php (modified) (2 diffs)
• language.zip (deleted)
• piclens (deleted)
• piclens_0.3.4.zip (deleted)

extensions/piclens/CHANGELOG

@@ -15 +15 @@
                  Migration depuis 0.3.x : Récupération et conversion des anciens paramètres noms et descriptions
                  
-
 Version 0.3.x
 -------------            
 0.3.6 --> Ajout parametres supplementaires du mur embeded  
-0.3.5 --> Ajout integration balises Extended Description dans le nom des categories 
-                Correction dans la traduction chinoise simplifiée 
-                Correction page admin : titre mur 3D non sauvegarde
+0.3.5 --> Ajout integration balises Extended Description dans le nom des categories
+          Correction dans la traduction chinoise simplifié
+          Correction page admin : titre mur 3D non sauvegarde
+          Ajout parametre nombre lignes pour le mur 3D embeded
+          Ajout possibilit?e ne pas afficher de titre sous les images
+          Ajout/correction tri par rang de l'image
 0.3.4 --> [MAJEUR] Correction de "l'emballement des hit images" lie a la selection des images depuis les categories speciales
                 Correction patch pour lien en https 

extensions/piclens/admin/rssfeed.php

@@ -14 +14 @@
 $me = get_plugin_data($plugin_id);
 
-$order_list = array(l10n('piclens_label_orderPiwigo'), l10n('piclens_label_orderCreDate'), l10n('piclens_label_orderAddDate'), l10n('piclens_label_orderRank'), l10n('piclens_label_orderBest'), l10n('piclens_label_orderName'), l10n('piclens_label_orderID'), l10n('piclens_label_orderRand'), l10n('piclens_label_orderCat'));
+$order_list = array(l10n('piclens_label_orderPiwigo'), l10n('piclens_label_orderCreDate'), l10n('piclens_label_orderAddDate'), l10n('piclens_label_orderAverage'), l10n('piclens_label_orderBest'), l10n('piclens_label_orderName'), l10n('piclens_label_orderID'), l10n('piclens_label_orderRand'), l10n('piclens_label_orderCat'), l10n('piclens_label_orderRank'));
 $sort_list = array(l10n('piclens_label_sortPiwigo'), l10n('piclens_label_sortUp'), l10n('piclens_label_sortDown'));
 

extensions/piclens/generate_rss.php

@@ -37 +37 @@
         $thumb_secure = array('', '&thumb=1', '');  // correspondant a 1-->'miniature' et 2-->'normal'
         $normal_secure = array('', '&thumb=1', '', '&highdef=1');       // correspondant a 1-->'miniature' et 2-->'normal' et 3 --> High
-        $order_list = array('', $conf['order_by_inside_category'], 'ORDER BY date_creation', 'ORDER BY date_available', 'ORDER BY average_rate', 'ORDER BY hit', 'ORDER BY file', 'ORDER BY id', 'ORDER BY RAND()', 'ORDER BY category_id');    
+        $order_list = array('', $conf['order_by_inside_category'], 'ORDER BY date_creation', 'ORDER BY date_available', 'ORDER BY average_rate', 'ORDER BY hit', 'ORDER BY file', 'ORDER BY id', 'ORDER BY RAND()', 'ORDER BY category_id', 'ORDER BY category_id, rank ');     
         $order_sort = array('', '', ' ASC', ' DESC');
 
@@ -563 +563 @@
                                 case 3 : 
                                         if (isset($row['comment']))
-                                                echo '<media:description type="html"><![CDATA['.$row['comment'].']]> </media:description>';                                     
-                                        break;
+                                                    { 
+                                                        if ($plugins_ExtendedDesc)      // Extended description compatibility 
+                                                        { 
+                                                            $desc=trigger_event('render_element_description',$row['comment']); 
+                                                            echo '<media:description type="html"><![CDATA['.$desc.']]> </media:description>'; 
+                                                        } 
+                                                        else 
+                                                            echo '<media:description type="html"><![CDATA['.$row['comment'].']]> </media:description>';                                      
+                                                    } 
+                                        break;
                                 default :
                                         break;