combined article display mode (option COMBINED_DISPLAY_MODE), remove xml feed output

[tt-rss.git] / tt-rss.php

diff --git a/tt-rss.php b/tt-rss.php
index f76614c2ea4c9a0ee895a50cc5dec006e4521d56..13c2b17c5ff012558271b304efd96b776ada3ede 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -209,8 +209,18 @@
                </td>
                </tr>
                </table>
-       </td> 
-</tr><tr>
+       </td>
+</tr>
+<? if (get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+<tr>
+       <td id="headlines" class="headlines2" valign="top">
+               <iframe frameborder="0" name="headlines-frame" 
+                       id="headlines-frame" class="headlinesFrame" 
+                               src="backend.php?op=error&msg=No%20feed%20selected."></iframe>
+       </td>
+</tr>
+<? } else { ?>
+<tr>
        <td id="headlines" class="headlines" valign="top">
                <iframe frameborder="0" name="headlines-frame" 
                        id="headlines-frame" class="headlinesFrame" 
@@ -222,6 +232,7 @@
                        id="content-frame" class="contentFrame"> </iframe>
        </td>
 </tr>
+<? } ?>
 <? if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
 <tr>
        <td colspan="2" class="footer">