diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index 693c29483..cacfc4fe5 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $ - | $Revision: 1.19 $ - | $Date: 2009-12-24 10:51:23 $ + | $Revision: 1.20 $ + | $Date: 2009-12-25 23:32:18 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -167,7 +167,7 @@ $text .= " { $id = $frm->name2id('core-infopanel_'.$val); $text .= " -
+
"; $text .= $tp->parseTemplate("{PLUGIN=$val|TRUE}"); diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index f8412c05f..73bdf29a7 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $ -| $Revision: 1.72 $ -| $Date: 2009-12-15 11:51:02 $ +| $Revision: 1.73 $ +| $Date: 2009-12-25 23:32:18 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -869,6 +869,11 @@ function core_media_import($cat,$epath) { if(!vartrue($cat)){ return;} + if(!is_readable($path)) + { + return; + } + $fl = e107::getFile(); $tp = e107::getParser(); $sql = e107::getDb(); diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index c5d1943c1..e57c18eaf 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.106 $ - * $Date: 2009-12-25 02:06:31 $ + * $Revision: 1.107 $ + * $Date: 2009-12-25 23:32:18 $ * $Author: e107coders $ * */ @@ -1308,9 +1308,9 @@ class e_form if(is_string($parms)) parse_str($parms, $parms); - if(vartrue($attributes['readonly'])) // quick fix (maybe 'noedit'=>'readonly'?) + if(vartrue($attributes['readonly']) && vartrue($value)) // quick fix (maybe 'noedit'=>'readonly'?) { - return $this->renderValue($key, $value, $attributes); + return $this->renderValue($key, $value, $attributes).$this->hidden($key, $value); // } switch($attributes['type']) @@ -1369,7 +1369,7 @@ class e_form { return $this->hidden($key, $value); } - + return $this->datepicker($key, $value, $parms); break; diff --git a/e107_themes/jayya/style.css b/e107_themes/jayya/style.css index c893989f1..e58cee430 100644 --- a/e107_themes/jayya/style.css +++ b/e107_themes/jayya/style.css @@ -398,6 +398,7 @@ img.S16 { width: 16px; height: 16px } img.S32 { width: 32px; height: 32px } img.S64 { width: 64px; height: 64px } img.S128 { width: 128px; height: 128px } +img.edit { margin-right: 5px } /*******************************************************************************************************************/ /******** Decorate JS */