[Bugin-hackers] bugin/lib database.inc.php,1.62,1.63

[<no...@us...>]

Update of /cvsroot/bugin/bugin/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5249/lib

Modified Files:
	database.inc.php 
Log Message:
testing GOOD.  now it really,m really works.



Index: database.inc.php
===================================================================
RCS file: /cvsroot/bugin/bugin/lib/database.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** database.inc.php	9 Mar 2004 13:45:28 -0000	1.62
--- database.inc.php	9 Mar 2004 14:55:04 -0000	1.63
***************
*** 594,607 ****
  		 Returns the templates for the given language ID. */
  	function getTemplates($langId, $options = array()) {
! 		$options['templatesFromFile'] = 0;
  		$query = $this->db->Execute("SELECT * FROM {$this->tablePrefix}_templates WHERE lang_id=".intval($langId));
  		if ($query->EOF) {
- 			$language = $this->lists['lang'][$langId]['name'];
- 			$ot = $options;
- 			require_once("{$options['buginBase']}conf/lang/email.{$language}.php");
- 			$options = array_merge($ot, $options);
  			$options['templatesFromFile'] = 1;
  		}
  		else {
  			while (!$query->EOF) {
  				if ($row = $query->fields) {
--- 594,604 ----
  		 Returns the templates for the given language ID. */
  	function getTemplates($langId, $options = array()) {
! 
  		$query = $this->db->Execute("SELECT * FROM {$this->tablePrefix}_templates WHERE lang_id=".intval($langId));
  		if ($query->EOF) {
  			$options['templatesFromFile'] = 1;
  		}
  		else {
+ 			$options['templatesFromFile'] = 0;
  			while (!$query->EOF) {
  				if ($row = $query->fields) {
***************
*** 620,627 ****
  				}
  				else {
! 					break(1);
  				}
  			}
  		}
  		return $options;
  	}
--- 617,632 ----
  				}
  				else {
! 					$options['templatesFromFile'] = 1;
! 					break(2);
  				}
  			}
  		}
+ 
+ 		if ($options['templatesFromFile'] == 1) {
+ 			$language = $this->lists['lang'][$langId]['name'];
+ 			$ot = $options;
+ 			require_once("{$options['buginBase']}conf/lang/email.{$language}.php");
+ 			$options = array_merge($ot, $options);
+ 		}
  		return $options;
  	}