[phpws-comm-commits] modules/article/class AM_Actions.php, 1.15, 1.16

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/class
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4037/class

Modified Files:
	AM_Actions.php 
Log Message:
If the specified XML file isn't found in the branch directory, XML_import will look in the hub directory as well.

Index: AM_Actions.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AM_Actions.php	21 Nov 2008 06:13:14 -0000	1.15
--- AM_Actions.php	19 Jan 2009 16:44:02 -0000	1.16
***************
*** 228,234 ****
  		$overwritten = false;
  		/* If the file exists, load it. */
! 		$filename = PHPWS_HOME_DIR . $directory . $file;
! 		if (!$xml = PHPWS_File::readFile($filename)) 
! 			return sprintf(dgettext('article', '"%s" could not be read.'), $filename);
  
  		/* Unserialize the data structure */
--- 228,236 ----
  		$overwritten = false;
  		/* If the file exists, load it. */
! 		$filename = $directory . $file;
! 		if (!$xml = @PHPWS_File::readFile(PHPWS_HOME_DIR . $filename)) 
!             //file not found -- look in source dir
!             if (!$xml = @PHPWS_File::readFile(PHPWS_SOURCE_DIR . $filename))
!                 return sprintf(dgettext('article', '"%s" could not be read.'), $filename);
  
  		/* Unserialize the data structure */