New: box_max_lines is used by boxes

This commit is contained in:
Laurent Destailleur 2008-05-19 08:12:21 +00:00
parent f433710e80
commit 8b31e31bd2
3 changed files with 6 additions and 7 deletions

View File

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

View File

@ -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$
*/

View File

@ -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();
}
}