Changeset 600 for team

Show
Ignore:
Timestamp:
09/09/07 13:00:27 (15 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/import_blogs
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • team/michiel/import_blogs

    • Property svnmerge-integrated changed from /trunk:1-597 to /trunk:1-599

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

    r573 r600  
    2020require("mvblog.php"); 
    2121$mvblog = new MvBlog(); 
    22 //get all the authors in an array 
    23 $res =& $mvblog->db->query("SELECT * FROM authors"); 
    24  
    25 if (PEAR::isError($res)) { 
    26         die($res->getMessage()); 
    27 } 
    28  
    29 while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) { 
    30         $authors[$row["id"]]["fullname"] = $row["fullname"]; 
    31         $authors[$row["id"]]["email"]    = $row["email"]; 
    32 } 
    3322 
    3423//generate url to the root of our website 
    … …  
    6554                $items[$i]["category"] = implode(", ", $category_names); 
    6655        } 
    67         $items[$i]["creator"] = htmlspecialchars($authors[$row["authors_id"]]["fullname"]); 
     56        $items[$i]["creator"] = htmlspecialchars($mvblog->authors[$row["authors_id"]]["fullname"]); 
    6857        $items[$i]["description"] = $mvblog->strip_bbcode(strip_tags(str_replace("##BREAKPOINT##", "", stripslashes($row["body"])))); 
    6958        $items[$i]["date"] = date("r", $row["date"]);