[pLog-svn] r476 - plog/trunk/class/locale

[oscar at devel.plogworld.net]

Author: oscar
Date: 2004-12-13 12:29:54 +0000 (Mon, 13 Dec 2004)
New Revision: 476

Modified:
   plog/trunk/class/locale/locale.class.php
   plog/trunk/class/locale/locales.class.php
Log:
couple of small fixes to the handling and removing of non-existing locales


Modified: plog/trunk/class/locale/locale.class.php
===================================================================
--- plog/trunk/class/locale/locale.class.php	2004-12-13 10:12:10 UTC (rev 475)
+++ plog/trunk/class/locale/locale.class.php	2004-12-13 12:29:54 UTC (rev 476)
@@ -79,7 +79,8 @@
 		{
 			$fileName = $this->_defaultFolder."/locale_".$this->_code.".php";
 
-			include( $fileName );
+			if( File::isReadable( $fileName ))
+				include( $fileName );
 
 			$this->_messages = $messages;
 		}

Modified: plog/trunk/class/locale/locales.class.php
===================================================================
--- plog/trunk/class/locale/locales.class.php	2004-12-13 10:12:10 UTC (rev 475)
+++ plog/trunk/class/locale/locales.class.php	2004-12-13 12:29:54 UTC (rev 476)
@@ -217,8 +217,10 @@
 
             $fileName = $this->getLocaleFilename( $localeCode );
 
-            if( !unlink( $fileName ))
-            	return false;
+		if( File::exists( $fileName )) {
+	            if( !unlink( $fileName ))
+        	    	return false;
+		}
 
             $availableLocales = $config->getValue( "locales" );