Ticket #6466: mythweb.fixrewritebase.2.patch

File mythweb.fixrewritebase.2.patch, 1.6 KB (added by raymond@…, 11 years ago)

correct patch file

  • mythplugins/mythweb/modules/tv/tmpl/default/upcoming.php

     
    436436
    437437</table>
    438438<?php
    439     $ical_href = str_replace(root, root.'ical/', $_SERVER['REQUEST_URI']).'?';
     439    if (root == '/')
     440        $ical_href = '/ical'.$_SERVER['REQUEST_URI'].'?';
     441    else
     442        $ical_href = str_replace(root, root.'ical/', $_SERVER['REQUEST_URI']).'?';
    440443    if (!$_SESSION['scheduled_recordings']['disp_scheduled'])
    441444        $ical_href .='skip_scheduled&';
    442445    if (!$_SESSION['scheduled_recordings']['disp_conflicts'])
  • mythplugins/mythweb/modules/tv/tmpl/default/recorded.php

     
    473473          )
    474474        .'</div>';
    475475
    476     echo '<div id="feed_buttons"><a href="'.str_replace(root, root.'rss/', $_SERVER['REQUEST_URI']).'"><img src="'.skin_url.'/img/rss2.0.gif"></a></div>';
     476    if (root == '/')
     477        $rss_href = '/rss'.$_SERVER['REQUEST_URI'];
     478    else
     479        $rss_href = str_replace(root, root.'rss/', $_SERVER['REQUEST_URI']);
     480    echo '<div id="feed_buttons"><a href="'.$rss_href.'"><img src="'.skin_url.'/img/rss2.0.gif"></a></div>';
    477481
    478482// Print the page footer
    479483    require 'modules/_shared/tmpl/'.tmpl.'/footer.php';