Author: nathangray
New Revision: 52826
URL: http://svn.stylite.de/viewvc/egroupware?rev=52826&view=rev
Log:
Some date formatting options could not be automatically parsed, so explicitly use user’s date & time settings.
Fixes intermittent automatic {{timestamp/date}} placeholder.
Modified:
branches/14.2/etemplate/ (props changed)
branches/14.2/etemplate/inc/class.bo_merge.inc.php
Propchange: branches/14.2/etemplate/
— svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 26 16:33:27 2015
@@ -1,1 +1,1 @@
-/trunk/etemplate:51364,51378,51382,51385,51389,51391,51397-51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907,51929,51933,51943,51948,51950-51951,51953,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52192,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52255,52258,52261-52262,52268,52275-52276,52278,52282,52285-52286,52296,52307,52321,52330,52334-52336,52340-52341,52353-52355,52357,52360,52368,52372-52373,52375,52379,52385,52406,52412,52423,52440,52447,52449,52455,52460,52470,52472,52477,52482,52487,52492,52495-52496,52510,52514,52519,52524,52555,52570,52573-52574,52
583,52610,52624,52627,52635,52664,52667,52688,52690,52696,52698,52708,52713,52718,52720,52726,52728,52732,52734,52749,52753,52787-52788,52790,52804-52806
+/trunk/etemplate:51364,51378,51382,51385,51389,51391,51397-51398,51405,51410,51412,51424-51425,51435,51437-51438,51450,51453-51454,51465,51488,51490,51516,51518,51522,51531,51533,51548,51551,51562,51565,51567,51580,51586-51589,51595,51600,51612,51628,51636,51645-51646,51649-51651,51680,51684,51690-51691,51695,51708,51712,51716-51717,51720,51791,51812,51814,51817,51822,51826,51830,51834,51874-51875,51886,51894,51903,51907,51929,51933,51943,51948,51950-51951,51953,51958,51971,51997,51999,52001,52012,52022,52036,52051,52072,52088,52093,52100,52103,52114,52117,52152-52153,52163,52175-52176,52188,52192,52194-52196,52204,52222,52224,52229,52232,52236,52238,52243,52245,52253,52255,52258,52261-52262,52268,52275-52276,52278,52282,52285-52286,52296,52307,52321,52330,52334-52336,52340-52341,52353-52355,52357,52360,52368,52372-52373,52375,52379,52385,52406,52412,52423,52440,52447,52449,52455,52460,52470,52472,52477,52482,52487,52492,52495-52496,52510,52514,52519,52524,52555,52570,52573-52574,52
583,52610,52624,52627,52635,52664,52667,52688,52690,52696,52698,52708,52713,52718,52720,52726,52728,52732,52734,52749,52753,52787-52788,52790,52804-52806,52819
Modified: branches/14.2/etemplate/inc/class.bo_merge.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/etemplate/inc/class.bo_merge.inc.php?rev=52826&r1=52825&r2=52826&view=diff
— branches/14.2/etemplate/inc/class.bo_merge.inc.php (original)
+++ branches/14.2/etemplate/inc/class.bo_merge.inc.php Tue May 26 16:33:27 2015
@@ -927,7 +927,8 @@
{
if($value = $replacements[’$$’.$field.’$$’])
{
-
$replacements['$$'.$field.'/date$$'] = egw_time::to($value,true);
-
$time = egw_time::createFromFormat('+'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat.'*', $value); -
$replacements['$$'.$field.'/date$$'] = $time ? $time->format(egw_time::$user_dateformat) : ''; } } }
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs