[pLog-svn] r6112 - plog/branches/lifetype-1.2/class/config

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-12-15 12:47:42 -0500 (Sat, 15 Dec 2007)
New Revision: 6112

Modified:
   plog/branches/lifetype-1.2/class/config/configfilestorage.class.php
Log:
fixed bug where you couldn't use 0 or false in file based config files, else the default value would always be used.  Removed getTempFolder() function, since the parent class already defines it identically

Modified: plog/branches/lifetype-1.2/class/config/configfilestorage.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/config/configfilestorage.class.php	2007-12-15 17:17:34 UTC (rev 6111)
+++ plog/branches/lifetype-1.2/class/config/configfilestorage.class.php	2007-12-15 17:47:42 UTC (rev 6112)
@@ -64,7 +64,6 @@
                 $this->_props = new Properties();
                 $result = false;
             }
-            
             return( $result );
         }
 
@@ -248,10 +247,7 @@
 
         function getValue( $key, $defaultValue = null )
         {
-        	$value = $this->_props->getValue( $key );
-            if( $value == "" || $value == null )
-            	if(isset($defaultValue))
-                	$value = $defaultValue;
+        	$value = $this->_props->getValue( $key, $defaultValue );
 
             return $value;
         }
@@ -299,19 +295,5 @@
 
             return true;
         }
-
-        /**
-         * shortcut for one of the most sought after config keys: temp_folder
-         *
-         * not really needed, but it makes my life easier since I never remember
-         * whether it is tmp_folder, temp_folder, temp_dir, or whatever :)
-         *
-         * @return The name of the folder used for temporary storage
-         */
-		function getTempFolder()
-        {
-            return $this->getValue( "temp_folder" );
-        }
-
 	}
 ?>