Changeset 753 for team

Show
Ignore:
Timestamp:
12/28/07 14:00:06 (11 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/input_formats
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • team/michiel/input_formats

    • Property svnmerge-integrated changed from /trunk:1-748 to /trunk:1-752

  • team/michiel/input_formats/common/mvblog.php

    r749 r753  
    7474         * Constructor to set some defaults 
    7575         * 
     76         * @param string $basedir If set use this directory where MvBlog is located. 
    7677         */ 
    7778        public function __construct ($basedir="") { 
    … …  
    352353         * limit the length of a message 
    353354         * 
    354          * @param string $text the text to limit in length 
     355         * @param string &$text the text to limit in length 
    355356         * @return int 1 if truncated, 0 if original string is within limits 
    356357         */ 
    … …  
    857858         * show 'month archive' menu links 
    858859         * 
    859          * @param int $ammount The number of months to show 
     860         * @param int $amount The number of months to show 
    860861         */ 
    861862        public function blog_archive_links($amount=5) {