more preferredtitle tweaks

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index b3ef45b2d4a785f9d360878e50ba15bc5a666a0a..1b05f64f33f2fe3b6c3739c643cbac63813a0bae 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -150,19 +150,21 @@ class block_rss_client extends block_base {
                 }
                 return;
             }
-            
-            if ($showtitle) {
-                $returnstring .= '<div class="rssclienttitle">'. $rss_record->title .'</div><br /><br />';
-            }
+
             if ($shownumentries > 0 && $shownumentries < count($rss->items) ) {
                 $rss->items = array_slice($rss->items, 0, $shownumentries);
             }
 
             if (empty($rss_record->preferredtitle)) {
-                $feedtitle = stripslashes_safe($rss_record->preferredtitle);
-            } else {
                 $feedtitle =  stripslashes_safe(rss_unhtmlentities($rss->channel['title']));
-            }            
+            } else {
+                $feedtitle = stripslashes_safe($rss_record->preferredtitle);
+            }          
+                        
+            if ($showtitle) {
+                $returnstring .= '<div class="rssclienttitle">'. $feedtitle .'</div><br /><br />';
+            }                        
+
             foreach ($rss->items as $item) {
                 $item['title'] = stripslashes_safe(rss_unhtmlentities($item['title']));
                 $item['description'] = stripslashes_safe(rss_unhtmlentities($item['description']));
@@ -205,4 +207,4 @@ class block_rss_client extends block_base {
         return $returnstring;
     }
 }
-?>
+?>
\ No newline at end of file

diff --git a/blocks/rss_client/config_instance.html b/blocks/rss_client/config_instance.html
index 64e37cefc90fc49a6fdd69ff06d24d7a9e210ef4..52fb04fa89c102e36de911207414511bc1c9138d 100644 (file)
--- a/blocks/rss_client/config_instance.html
+++ b/blocks/rss_client/config_instance.html
@@ -54,8 +54,12 @@
             }
             if ($rssfeeds = get_records('block_rss_client')) {
                 foreach($rssfeeds as $rssfeed){
-                    if ($rss
-                    $feedoptions[$rssfeed->id] = $rssfeed->title;
+                    if (!empty($rssfeed->preferredtitle)) {
+                        $feedtitle = $rssfeed->preferredtitle;
+                    } else {
+                        $feedtitle = $rssfeed->title;                    
+                    } 
+                    $feedoptions[$rssfeed->id] = $feedtitle;
                 }
                 $dropdownmenustring = choose_from_menu($feedoptions, 'rssid[]', '', '', '', '0', true);