Changeset 679 for team

Show
Ignore:
Timestamp:
10/03/07 23:00:40 (15 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/import_blogs
Files:
3 modified
1 copied

Legend:

Unmodified
Added
Removed

  • team/michiel/import_blogs

    • Property svnmerge-integrated changed from /trunk:1-674 to /trunk:1-678

  • team/michiel/import_blogs/common/mvblog_common.php

    r658 r679  
    878878                echo "\t\t</div>\n"; 
    879879                echo "\t</div>\n"; 
    880                 echo "</body>\n"; 
    881                 echo "</html>\n"; 
    882880        } 
    883881        /* }}} */ 

  • team/michiel/import_blogs/index.php

    r594 r679  
    2121$mvblog = new MvBlog(); 
    2222$mvblog->html_header(); 
     23if (file_exists("index-alt.php")) { 
     24        require("index-alt.php"); 
     25} else { 
    2326        ?> 
    2427        <div id="if_container"> 
    … …  
    7376 
    7477                        </tr></table> 
    75 <?php $mvblog->html_footer(); ?> 
     78        <?php  
     79        $mvblog->html_footer(); 
     80} 
     81?> 
     82</body> 
     83</html>