[pLog-svn] blogs.class.php

Jon Daley plogworld at jon.limedaley.com
Thu Sep 22 01:11:44 GMT 2005


------------------------------------------------------------------------
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;
          }




More information about the pLog-svn mailing list