From 5c2eed9a193e9341fbfee63d4a973898acdc5ee5 Mon Sep 17 00:00:00 2001 From: lisps Date: Thu, 21 Nov 2013 15:50:52 +0100 Subject: add parameter at($DATE_AT) and mind revisions --- inc/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index dd30b53ab..e5e4f78c8 100644 --- a/inc/common.php +++ b/inc/common.php @@ -161,7 +161,7 @@ function pageinfo() { if($REV) { //check if current revision was meant if($info['exists'] && (@filemtime($info['filepath']) == $REV)) { - $REV = ''; + //$REV = ''; //if we enter a rev we want to see that revision (inc media files) } elseif($RANGE) { //section editing does not work with old revisions! $REV = ''; -- cgit v1.2.3 From 4bde2196a1e3572cead3f4d4e4b6a5a752bd62b3 Mon Sep 17 00:00:00 2001 From: lisps Date: Fri, 22 Nov 2013 09:04:44 +0100 Subject: remove property rev from xhtml.php changed variable name $create_time to $modified_time --- inc/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index e5e4f78c8..7f7095a12 100644 --- a/inc/common.php +++ b/inc/common.php @@ -383,6 +383,7 @@ function idfilter($id, $ue = true) { function wl($id = '', $urlParameters = '', $absolute = false, $separator = '&') { global $conf; if(is_array($urlParameters)) { + if(isset($urlParameters['rev']) && !$urlParameters['rev']) unset($urlParameters['rev']); $urlParameters = buildURLparams($urlParameters, $separator); } else { $urlParameters = str_replace(',', $separator, $urlParameters); -- cgit v1.2.3 From 78b874e68a5f2a45f71a91efb168761c283e3a91 Mon Sep 17 00:00:00 2001 From: lisps Date: Fri, 22 Nov 2013 10:51:16 +0100 Subject: fix function name media_isexternal() remove empty rev from ml() rename getProperRevision() to getLastRevisionAt() make getLastRevisionAt() a method of ChangeLog --- inc/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index 106bf7c15..5dcf58e39 100644 --- a/inc/common.php +++ b/inc/common.php @@ -484,6 +484,7 @@ function ml($id = '', $more = '', $direct = true, $sep = '&', $abs = false) if(empty($more['w'])) unset($more['w']); if(empty($more['h'])) unset($more['h']); if(isset($more['id']) && $direct) unset($more['id']); + if(isset($more['rev']) && !$more['rev']) unset($more['rev']); $more = buildURLparams($more, $sep); } else { $matches = array(); -- cgit v1.2.3 From d81178045b12622c84f48c892ddda32c6aba5576 Mon Sep 17 00:00:00 2001 From: lisps Date: Fri, 22 Nov 2013 13:56:58 +0100 Subject: restore old version of pageinfo() --- inc/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index 5dcf58e39..ce74717d0 100644 --- a/inc/common.php +++ b/inc/common.php @@ -161,7 +161,7 @@ function pageinfo() { if($REV) { //check if current revision was meant if($info['exists'] && (@filemtime($info['filepath']) == $REV)) { - //$REV = ''; //if we enter a rev we want to see that revision (inc media files) + $REV = ''; } elseif($RANGE) { //section editing does not work with old revisions! $REV = ''; -- cgit v1.2.3 From 7b62b42de1887c3627c727f0483aea41556742d4 Mon Sep 17 00:00:00 2001 From: lisps Date: Wed, 19 Mar 2014 10:32:55 +0100 Subject: add config date_at_format change translation message --- inc/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index 0b15c284d..44cfe91ba 100644 --- a/inc/common.php +++ b/inc/common.php @@ -395,6 +395,7 @@ function wl($id = '', $urlParameters = '', $absolute = false, $separator = '& global $conf; if(is_array($urlParameters)) { if(isset($urlParameters['rev']) && !$urlParameters['rev']) unset($urlParameters['rev']); + if(isset($urlParameters['at']) && $conf['date_at_format']) $urlParameters['at'] = date($conf['date_at_format'],$urlParameters['at']); $urlParameters = buildURLparams($urlParameters, $separator); } else { $urlParameters = str_replace(',', $separator, $urlParameters); -- cgit v1.2.3