From 8b31e31bd25f3a23bb4364fddaae959fef1248e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 19 May 2008 08:12:21 +0000
Subject: [PATCH] New: box_max_lines is used by boxes

---
 htdocs/conf/conf.class.php            | 2 +-
 htdocs/includes/boxes/box_actions.php | 3 +--
 htdocs/index.php                      | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php
index a962ef3d67f..7ec92a56fd5 100644
--- a/htdocs/conf/conf.class.php
+++ b/htdocs/conf/conf.class.php
@@ -366,7 +366,7 @@ class Conf
 
 		// conf->box_max_lines
 		$this->box_max_lines=5;
-		if (isset($conf->global->MAIN_BOXES_MAXLINES)) $this->box_max_lines=$conf->global->MAIN_BOXES_MAXLINES;
+		if (isset($this->global->MAIN_BOXES_MAXLINES)) $this->box_max_lines=$this->global->MAIN_BOXES_MAXLINES;
 		
 		// conf->use_preview_tabs
 		$this->use_preview_tabs=0;
diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php
index bcfe7c189c8..42f6287453e 100644
--- a/htdocs/includes/boxes/box_actions.php
+++ b/htdocs/includes/boxes/box_actions.php
@@ -16,14 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
  
  /**
 		\file       htdocs/includes/boxes/box_actions.php
 		\ingroup    actions
 		\brief      Module de generation de l'affichage de la box actions
+		\version	$Id$
 */
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 034d0293876..b4747ba6181 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -581,7 +581,7 @@ if (sizeof($boxarray))
 		  //print 'box_order '.$boxarray[$ii]->box_order.'<br>';
 		  $boxid_left[$key] = $boxarray[$key]->box_id;
 			// Affichage boite key
-			$box->loadBox();
+			$box->loadBox($conf->box_max_lines);
 			$box->showBox();
 		}
 	}
@@ -612,10 +612,10 @@ if (sizeof($boxarray))
 			$ii++;
 			//print 'key:'.$key.'<br>';
 			//print 'box_id '.$boxarray[$key]->box_id.' ';
-		  //print 'box_order '.$boxarray[$key]->box_order.'<br>';
-		  $boxid_right[$key] = $boxarray[$key]->box_id;
+		  	//print 'box_order '.$boxarray[$key]->box_order.'<br>';
+		  	$boxid_right[$key] = $boxarray[$key]->box_id;
 			// Affichage boite key
-			$box->loadBox();
+			$box->loadBox($conf->box_max_lines);
 			$box->showBox();
 		}
 	}