From: <sy...@us...> - 2010-02-18 13:20:09
|
Revision: 25343 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=25343&view=rev Author: sylvieg Date: 2010-02-18 13:19:44 +0000 (Thu, 18 Feb 2010) Log Message: ----------- [FIX]history: Do not change the history version if no history is kept (otherwise people think they are losing history Modified Paths: -------------- trunk/lib/tikilib.php Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2010-02-18 09:36:25 UTC (rev 25342) +++ trunk/lib/tikilib.php 2010-02-18 13:19:44 UTC (rev 25343) @@ -7675,7 +7675,8 @@ $minor=$info["version_minor"]; $description = $info['description']; $data = $info["data"]; - $version = $old_version + 1; + $willDoHistory = ($prefs['feature_wiki_history_full'] == 'y' || $data != $edit_data || $description != $edit_description || $comment != $edit_comment ); + $version = $old_version + ($willDoHistory?1:0); if( $prefs['quantify_changes'] == 'y' && $prefs['feature_multilingual'] == 'y' ) { include_once 'lib/wiki/quantifylib.php'; @@ -7775,7 +7776,7 @@ } // This if no longer checks for minor-ness of the change; sendWikiEmailNotification does that. - if( $prefs['feature_wiki_history_full'] == 'y' || $data != $edit_data || $description != $edit_description || $comment != $edit_comment ) { + if( $willDoHistory ) { if (strtolower($pageName) != 'sandbox') { $query = "insert into `tiki_history`(`pageName`, `version`, `version_minor`, `lastModif`, `user`, `ip`, `comment`, `data`, `description`,`is_html`) values(?,?,?,?,?,?,?,?,?,?)"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |