[pLog-svn] r2447 - plog/branches/plog-1.0.2/class/action

[Oscar Renalias]

I didn't mean that your commit was wrong or anything :-) It's allowed
to fix major bugs, but if there's anything small, I think it's ok to
wait. I was just thinking that we should freeze the branch so that I
can create a final package and upload it to sf.net for people to test.

Oscar

On 9/5/05, Mark Wu <markplace at gmail.com> wrote:
> I found this bug yesterday, so jusy commit it to 1.0.2 SVN. I think  bugs
> fix is allowed, right?
> 
> BTW, the patch file you made several days ago, I already test it in my
> localhost, it works very well....
> 
> Mark
> 
> > -----Original Message-----
> > From: plog-svn-bounces at devel.plogworld.net
> > [mailto:plog-svn-bounces at devel.plogworld.net] On Behalf Of
> > Oscar Renalias
> > Sent: Monday, September 05, 2005 3:45 AM
> > To: plog-svn at devel.plogworld.net
> > Subject: Re: [pLog-svn] r2447 - plog/branches/plog-1.0.2/class/action
> >
> > is there anything else any of you would like to commit to the
> > plog-1.0.2 branch? If not, let's freeze that branch. If
> > anything else comes up, we'll start a plog-1.0.3 branch if
> > necessary...
> >
> > Oscar
> >
> > On 4 Sep 2005, at 18:22, mark at devel.plogworld.net wrote:
> >
> > > Author: mark
> > > Date: 2005-09-04 15:22:37 +0000 (Sun, 04 Sep 2005) New
> > Revision: 2447
> > >
> > > Modified:
> > >    plog/branches/plog-1.0.2/class/action/blogaction.class.php
> > >    plog/branches/plog-1.0.2/class/action/
> > > resourceserveraction.class.php
> > > Log:
> > > Add some "else" statement to blogId look out founction.
> > This can make
> > > sure if pLog can not find propreiate blogId , it will use
> > > default_blog_id as the blogId.
> > >
> > > Modified: plog/branches/plog-1.0.2/class/action/blogaction.class.php
> > > ===================================================================
> > > --- plog/branches/plog-1.0.2/class/action/blogaction.class.php
> > > 2005-09-03 21:27:38 UTC (rev 2446)
> > > +++ plog/branches/plog-1.0.2/class/action/blogaction.class.php
> > > 2005-09-04 15:22:37 UTC (rev 2447)
> > > @@ -154,7 +154,7 @@
> > >              // "user" parameter.
> > >              if( !$blogId && !$blogName ) {
> > >                  // check if there was a user parameter
> > > -                 if( !empty($userName) ) {
> > > +                if( !empty($userName) ) {
> > >                      // if so, check to which blogs the user belongs
> > >                      $users = new Users();
> > >                       $userInfo = $users->getUserInfoFromUsername (
> > > $userName ); @@ -165,7 +165,11 @@
> > >                          // get the first one (any better rule for
> > > this?)
> > >                          if( !empty($userBlogs)) {
> > >                              $blogId = $userBlogs[0]->getId();
> > > +                        } else {
> > > +                            $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >                          }
> > > +                    } else {
> > > +                        $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >                      }
> > >                  }
> > >                  else {
> > > @@ -178,6 +182,8 @@
> > >                          $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >                      }
> > >                  }
> > > +            } else {
> > > +                $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >              }
> > >
> > >              // fetch the BlogInfo object
> > >
> > > Modified: plog/branches/plog-1.0.2/class/action/
> > > resourceserveraction.class.php
> > > ===================================================================
> > > --- plog/branches/plog-1.0.2/class/action/
> > > resourceserveraction.class.php    2005-09-03 21:27:38 UTC (rev 2446)
> > > +++ plog/branches/plog-1.0.2/class/action/
> > > resourceserveraction.class.php    2005-09-04 15:22:37 UTC (rev 2447)
> > > @@ -60,7 +60,7 @@
> > >              // "user" parameter.
> > >              if( !$blogId && !$blogName ) {
> > >                  // check if there was a user parameter
> > > -                 if( !empty($userName) ) {
> > > +                if( !empty($userName) ) {
> > >                      // if so, check to which blogs the user belongs
> > >                      $users = new Users();
> > >                       $userInfo = $users->getUserInfoFromUsername (
> > > $userName ); @@ -71,7 +71,11 @@
> > >                          // get the first one (any better rule for
> > > this?)
> > >                          if( !empty($userBlogs)) {
> > >                              $blogId = $userBlogs[0]->getId();
> > > +                        } else{
> > > +                            $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >                          }
> > > +                    } else{
> > > +                        $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >                      }
> > >                  }
> > >                  else {
> > > @@ -84,6 +88,8 @@
> > >                          $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >                      }
> > >                  }
> > > +            } else {
> > > +                $blogId = $this->_config->getValue
> > > ('default_blog_id');
> > >              }
> > >
> > >              // fetch the BlogInfo object
> > >
> > > _______________________________________________
> > > pLog-svn mailing list
> > > pLog-svn at devel.plogworld.net
> > > http://devel.plogworld.net/mailman/listinfo/plog-svn
> > >
> > >
> >
> > _______________________________________________
> > pLog-svn mailing list
> > pLog-svn at devel.plogworld.net
> > http://devel.plogworld.net/mailman/listinfo/plog-svn
> 
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn
>