Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

1 files changed, 3 insertions, 3 deletions

diff --git a/inc/actions.php b/inc/actions.php
index 4a2e200ae..e85cbfccc 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -380,7 +380,7 @@ function act_revert($act){
     if($REV){
         $text = rawWiki($ID,$REV);
         if(!$text) return 'show'; //something went wrong
-        $sum  = $lang['restored'];
+        $sum = sprintf($lang['restored'], dformat($REV));
     }
 
     // spam check
@@ -498,7 +498,7 @@ function act_edit($act){
     //set summary default
     if(!$SUM){
         if($REV){
-            $SUM = $lang['restored'];
+            $SUM = sprintf($lang['restored'], dformat($REV));
         }elseif(!$INFO['exists']){
             $SUM = $lang['created'];
         }
@@ -506,7 +506,7 @@ function act_edit($act){
 
     // Use the date of the newest revision, not of the revision we edit
     // This is used for conflict detection
-    if(!$DATE) $DATE = $INFO['meta']['date']['modified'];
+    if(!$DATE) $DATE = @filemtime(wikiFN($ID));
 
     //check if locked by anyone - if not lock for my self
     //do not lock when the user can't edit anyway