diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 7d5c5226b..3974b04e1 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -9,9 +9,9 @@
  * Administration - Site Preferences
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $
- * $Revision: 1.39 $
- * $Date: 2009-12-19 17:54:00 $
- * $Author: e107steved $
+ * $Revision: 1.40 $
+ * $Date: 2009-12-23 10:04:38 $
+ * $Author: e107coders $
  *
 */
 require_once ("../class2.php");
@@ -234,11 +234,19 @@ $parms .= "&label=-- No Image --";
 $parms .= "&subdirs=1";
 $parms .= "&tabindex=".$frm->getNext();
 
+
 $text .= "<div class='field-section'>".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=select}")."</div>";
+// $text .= "<div class='field-section'>".$frm->imagepicker('sitebutton',$pref['sitebutton'],'-- No Image --')."</div>";
+
+//TODO make the preview update when image-picker is used. 
 $text .= "<div class='field-spacer'>".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=preview}")."</div>";
 
 $text .= "
 						</td>
+						
+	<tr>
+						<td class='label'>".PRFLAN_214."</td>
+						<td class='control'>".$frm->imagepicker('sitelogo',$pref['sitelogo'],'-- No Image --')."</td>
 					</tr>
 					<tr>
 						<td class='label'>".PRFLAN_5."</td>
diff --git a/e107_files/default_install.xml b/e107_files/default_install.xml
index 1a58c7956..8a993add7 100644
--- a/e107_files/default_install.xml
+++ b/e107_files/default_install.xml
@@ -170,6 +170,7 @@ City, State, Country
 		<core name='sitedisclaimer'><![CDATA[This site is powered by [link=http://e107.org/]e107[link], which is released under the terms of the [link=http://www.gnu.org/]GNU[/link] GPL License.]]></core>
 		<core name='sitelang_init'>English</core>
 		<core name='sitelanguage'>English</core>
+		<core name='sitelogo'></core>
 		<core name='sitename'>e107 Website System</core>
 		<core name='sitetag'>e107 Website System</core>
 		<core name='sitetheme'>jayya</core>
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 3c6f5915e..b09ab6035 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,8 +9,8 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.101 $
- * $Date: 2009-12-20 23:46:51 $
+ * $Revision: 1.102 $
+ * $Date: 2009-12-23 10:04:38 $
  * $Author: e107coders $
  *
 */
@@ -179,6 +179,7 @@ class e_form
 		$cal_options['weekNumbers'] = varset($options['weeks'], false);
 		$cal_options['ifFormat'] = e107::getPref('inputdate', '%d/%m/%Y %H:%M:%S');
 		$cal_options['timeFormat'] = "24";
+
 		$cal_attrib['class'] = "tbox date";
 		$cal_attrib['size'] = varset($options['size'], 25);
 		$cal_attrib['name'] = $name;
@@ -1353,6 +1354,16 @@ class e_form
 			break;
 			
 			case 'datestamp':
+				if(vartrue($parms['auto']))
+				{
+					$value = time();
+				}
+					
+				if(vartrue($parms['hidden']))
+				{
+					return $this->hidden($key, $value);
+				}
+					
 				return $this->datepicker($key, $value, $parms);
 			break;
 			
diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php
index 4060fef80..8ee1b8f1d 100644
--- a/e107_languages/English/admin/lan_prefs.php
+++ b/e107_languages/English/admin/lan_prefs.php
@@ -12,8 +12,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_prefs.php,v $
-|     $Revision: 1.24 $
-|     $Date: 2009-11-18 01:05:12 $
+|     $Revision: 1.25 $
+|     $Date: 2009-12-23 10:04:39 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -228,6 +228,6 @@ define('PRFLAN_210', 'Comments/Posting');
 define('PRFLAN_211', 'Cannot make email address optional if required for validation or login');
 define('PRFLAN_212', 'Value for --FIELD-- too high - changed to --VALUE--');
 define('PRFLAN_213', 'Value for --FIELD-- too low - changed to --VALUE--');
-
+define('PRFLAN_214', "Site Logo");
 
 ?>
\ No newline at end of file
diff --git a/e107_plugins/siteinfo/e_shortcode.php b/e107_plugins/siteinfo/e_shortcode.php
index 51e4e2426..0b831a0dd 100644
--- a/e107_plugins/siteinfo/e_shortcode.php
+++ b/e107_plugins/siteinfo/e_shortcode.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: e_shortcode.php,v 1.1 2009-09-19 17:36:35 e107coders Exp $
+* $Id: e_shortcode.php,v 1.2 2009-12-23 10:04:39 e107coders Exp $
 *
 * Siteinfo shortcode batch
 */
@@ -43,8 +43,17 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 	{
 		parse_str($parm);		// Optional {LOGO=file=file_name} or {LOGO=link=url} or {LOGO=file=file_name&link=url}
 		// Paths to image file, link are relative to site base
-
-		if (isset($file) && $file && is_readable($file))
+		$tp = e107::getParser();
+				
+		$logopref = e107::getConfig('core')->get('sitelogo');
+		$logo = $tp->replaceConstants($logopref);
+	
+		if(vartrue($logopref) && is_readable($logo))
+		{
+			$logo = $tp->replaceConstants($logopref,'abs');
+			$path = $tp->replaceConstants($logopref);
+		}
+		elseif (isset($file) && $file && is_readable($file))
 		{
 			$logo = e_HTTP.$file;						// HTML path
 			$path = e_BASE.$file;						// PHP path