xoops-cvs2

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv1960

Modified Files:
	xoopsblock.php 
Log Message:
no message

Index: xoopsblock.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsblock.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xoopsblock.php	8 Aug 2002 17:50:09 -0000	1.3
--- xoopsblock.php	6 Sep 2002 02:28:42 -0000	1.4
***************
*** 181,188 ****
  				// align content if there is additional content
  				// in db
! 				$block['content'] = $this->buildContent($this->getVar("position"),$block['content'],$this->getContent("S",$this->getVar("c_type")));
  				// replace title if there is additional title
  				// in db
! 				$block['title'] = $this->buildTitle($block['title'], $this->getVar("title"));
  			} else {
  				return false;
--- 181,188 ----
  				// align content if there is additional content
  				// in db
! 				$block['content'] =& $this->buildContent($this->getVar("position"),$block['content'],$this->getContent("S",$this->getVar("c_type")));
  				// replace title if there is additional title
  				// in db
! 				$block['title'] =& $this->buildTitle($block['title'], $this->getVar("title"));
  			} else {
  				return false;
***************
*** 204,208 ****
  	* after the original content
  	*/
! 	function buildContent($position,$content="",$contentdb="") {
  		if ( $position == 0 ) {
  			$ret = $contentdb.$content;
--- 204,208 ----
  	* after the original content
  	*/
! 	function &buildContent($position,$content="",$contentdb="") {
  		if ( $position == 0 ) {
  			$ret = $contentdb.$content;
***************
*** 213,217 ****
  	}
  
! 	function buildTitle($originaltitle, $newtitle="") {
  		if ($newtitle != "") {
  			$ret = $newtitle;
--- 213,217 ----
  	}
  
! 	function &buildTitle($originaltitle, $newtitle="") {
  		if ($newtitle != "") {
  			$ret = $newtitle;