Merge branch 'patch-3' into 'stable-3.1'

Till Brehm · Till Brehm · commit 1d87d80fb9eb · 2016-07-01T13:41:57.000+02:00
Load correct datetimeformat

Load correct datetimeformat for remote api

See merge request !361
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
@@ -98,6 +98,7 @@ function loadFormDef($file, $module = '') {
 		unset($form);
 
 		$this->dateformat = $app->lng('conf_format_dateshort');
+		$this->datetimeformat = $app->lng('conf_format_datetime');
 
 		return true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ function loadFormDef($file, $module = '') {`
`98`	`98`	`unset($form);`
`99`	`99`
`100`	`100`	`$this->dateformat = $app->lng('conf_format_dateshort');`
	`101`	`+ $this->datetimeformat = $app->lng('conf_format_datetime');`
`101`	`102`
`102`	`103`	`return true;`
`103`	`104`	`}`