[geeklog-cvs] Geeklog-1.x/public_html/layout/professional functions.php, 1.13, 1.14

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv80573/public_html/layout/professional

Modified Files:
	functions.php 
Log Message:
Adopted hack to allow multilingual blocks (bug #0000626)


Index: functions.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/functions.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** functions.php	31 May 2008 18:38:48 -0000	1.13
--- functions.php	4 Jul 2008 11:58:54 -0000	1.14
***************
*** 2,19 ****
  
  // this file can't be used on its own
! if (strpos ($_SERVER['PHP_SELF'], 'functions.php') !== false) {
!     die ('This file can not be used on its own!');
  }
  
  $_IMAGE_TYPE = 'png';
  
! if (!defined ('XHTML')) {
!     define('XHTML',''); // change this to ' /' for XHTML
  }
  
! $result = DB_query ("SELECT onleft,name FROM {$_TABLES['blocks']} WHERE is_enabled = 1");
! $nrows = DB_numRows ($result);
  for ($i = 0; $i < $nrows; $i++) {
!     $A = DB_fetchArray ($result);
          if ($A['onleft'] == 1) {
              $_BLOCK_TEMPLATE[$A['name']] = 'blockheader-left.thtml,blockfooter-left.thtml';
--- 2,24 ----
  
  // this file can't be used on its own
! if (strpos($_SERVER['PHP_SELF'], 'functions.php') !== false) {
!     die('This file can not be used on its own!');
  }
  
  $_IMAGE_TYPE = 'png';
  
! if (!defined('XHTML')) {
!     define('XHTML', ''); // change this to ' /' for XHTML
  }
  
! $lang = COM_getLanguageId();
! if (empty($lang)) {
!     $result = DB_query("SELECT onleft,name FROM {$_TABLES['blocks']} WHERE is_enabled = 1");
! } else {
!     $result = DB_query("SELECT onleft,name FROM {$_TABLES['blocks']}");
! }
! $nrows = DB_numRows($result);
  for ($i = 0; $i < $nrows; $i++) {
!     $A = DB_fetchArray($result);
          if ($A['onleft'] == 1) {
              $_BLOCK_TEMPLATE[$A['name']] = 'blockheader-left.thtml,blockfooter-left.thtml';