[phpwsbb-commits] phpwsbb/class Forum.php,1.32,1.33 Message.php,1.70,1.71 Thread.php,1.63,1.64

[Steven L. <jyd...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12183/class

Modified Files:
	Forum.php Message.php Thread.php 
Log Message:
Fixes for the upgrade bug being discussed on dev list


Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Thread.php	3 Oct 2004 02:39:10 -0000	1.63
--- Thread.php	25 Oct 2004 17:35:22 -0000	1.64
***************
*** 265,269 ****
            $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=usersettings">' . $_SESSION['translate']->it('My Forum Settings') . '</a>';
          
!         return '<a name="bb-top" />'
              . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'view_thread_top.tpl')
              . $content
--- 265,269 ----
            $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=usersettings">' . $_SESSION['translate']->it('My Forum Settings') . '</a>';
          
!         return '<a name="bb-top"></a>'
              . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'view_thread_top.tpl')
              . $content
***************
*** 273,277 ****
  
  
!     function updateThread($new = FALSE) {
          if (!empty($this->_id)) {
              $sql = 'SELECT id FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_messages WHERE tid=' . $this->getId() . ' ORDER BY created;';
--- 273,277 ----
  
  
!     function updateThread($new = FALSE, $suppress_sets = FALSE) {
          if (!empty($this->_id)) {
              $sql = 'SELECT id FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_messages WHERE tid=' . $this->getId() . ' ORDER BY created;';
***************
*** 313,320 ****
              $this->_replies = 0;
          }
!         $this->commit();
  
          $forum = new PHPWSBB_Forum($this->_fid);
!         $forum->updateForum();
  
          // Send email to monitors for new messages
--- 313,320 ----
              $this->_replies = 0;
          }
!         $this->commit(null, $suppress_sets);
  
          $forum = new PHPWSBB_Forum($this->_fid);
!         $forum->updateForum($suppress_sets);
  
          // Send email to monitors for new messages
***************
*** 555,558 ****
--- 555,559 ----
  
      function action() {
+ 	$title =  null;
          switch($_REQUEST['PHPWSBB_THREAD_OP']) {
              case 'view':

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** Message.php	20 Oct 2004 01:37:41 -0000	1.70
--- Message.php	25 Oct 2004 17:35:22 -0000	1.71
***************
*** 343,347 ****
              $tags['MESSAGE_BODY'] = PHPWS_WizardBag::js_insert('wysiwyg', 'PHPWSBB_Message_edit', 'Message_body') . $tags['MESSAGE_BODY'];
  
!         $content = '<a name="bb-top" />'.PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit.tpl');
          if ($thread) {
              $content .= $thread->_view(TRUE);
--- 343,347 ----
              $tags['MESSAGE_BODY'] = PHPWS_WizardBag::js_insert('wysiwyg', 'PHPWSBB_Message_edit', 'Message_body') . $tags['MESSAGE_BODY'];
  
!         $content = '<a name="bb-top"></a>'.PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit.tpl');
          if ($thread) {
              $content .= $thread->_view(TRUE);

Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Forum.php	2 Oct 2004 10:43:59 -0000	1.32
--- Forum.php	25 Oct 2004 17:35:22 -0000	1.33
***************
*** 361,365 ****
  
  
!     function updateForum() {
          if(!empty($this->_id)) {
              /* Develop total replies and extended thread information */
--- 361,365 ----
  
  
!     function updateForum($suppress_sets = FALSE) {
          if(!empty($this->_id)) {
              /* Develop total replies and extended thread information */
***************
*** 381,385 ****
              $this->_threads = 0;
          }
!         $this->commit();
  
      }// END FUNC updateForum
--- 381,385 ----
              $this->_threads = 0;
          }
!         $this->commit(null, $suppress_sets);
  
      }// END FUNC updateForum