[pLog-svn] blogs.class.php
Oscar Renalias
oscar at renalias.net
Thu Sep 22 05:52:50 GMT 2005
I can't remember now... but one of the method calls wasn't correct. I
didn't check if it got messed up during the merge or if the mistake
was already there. All is well now, it seems to work fine :)
Oscar
On 22 Sep 2005, at 04:11, Jon Daley wrote:
> ----------------------------------------------------------------------
> --
> r2492 | oscar | 2005-09-19 03:04:48 -0400 (Mon, 19 Sep 2005) | 2 lines
>
> added something that probably got lost in the merge process
>
> ----------------------------------------------------------------------
> --
> r2487 | jondaley | 2005-09-19 00:17:27 -0400 (Mon, 19 Sep 2005) | 1
> line
>
> must be a merge problem
>
> The funny thing is, this file wasn't merged... So, I probably
> broke it, did you/Oscar fix it correctly, or was it correct before
> I changed it?
>
>
>
> devel/newplog/class/dao>svn diff -r2486:2487 blogs.class.php Index:
> blogs.class.php
> ===================================================================
> --- blogs.class.php (revision 2486)
> +++ blogs.class.php (revision 2487)
> @@ -85,7 +85,7 @@
> $bayesianFilterInfo->insert( $blogId );
>
> $this->_cache->setData( $blogId, CACHE_BLOGINFOS,
> $blog );
> - $this->_cache->setData( $blog->getMangledBlogName(),
> CACHE_BLOGIDBYNAME );
> +// $this->_cache->setData( $blog->getMangledBlogName(),
> CACHE_BLOGIDBYNAME );
>
> // and return the blog identifier
> return $blogId;
>
>
>
> devel/newplog/class/dao>svn diff -r2491:2492 blogs.class.php Index:
> blogs.class.php
> ===================================================================
> --- blogs.class.php (revision 2491)
> +++ blogs.class.php (revision 2492)
> @@ -258,6 +258,8 @@
> $blogInfo->setTotalPosts( $row['num_posts'] );
> $blogInfo->setTotalTrackbacks( $row
> ['num_trackbacks'] );
> $blogInfo->setTotalComments( $row
> ['num_comments'] );
> + // mangled blog
> + $blogInfo->setMangledBlogName( $row
> ['mangled_blog'] );
>
> return $blogInfo;
> }
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn
>
>
More information about the pLog-svn
mailing list