Recent Changes - Search:
Cookbook /

SimultaneousEdits

Summary: Enable simultaneous edits for platforms without popen or diff3
Version: 20170814
Prerequisites: pmwiki-2.1.0
Status: Experimental
Maintainer: Petko (Original author: Pm)
Categories: Administration, Windows, PHP72
License: GPL2+, LGPL
Users: (view? / edit)
Discussion: SimultaneousEdits-Talk

Questions answered by this recipe

How can I get simultaneous edits to work on systems that can't call the Unix diff3 command?

Answer

The phpmerge.phpΔ script replaces the merge function distributed with PmWiki with a version that doesn't require an external diff3 program. To use this script, simply copy it to the cookbook/ directory and add the following lines to local/config.php: 

    include_once('cookbook/phpmerge.php');

This will cause PmWiki to attempt to merge simultaneous edits, denoting conflicting sections with <<<<<<< and >>>>>>> as appropriate.

For PHP 5.2 or earlier, please use phpmerge-old.phpΔ instead.

Notes

Change log / release notes (Petko)

  • 20160215: Fix messages "Deprecated: Assigning the return value of new by reference".
  • 20170814: Update classes __construct functions for PHP 5 and 7, proposed by Asa Packer.

See Also

Contributors

  • Petko update for recent PHP versions, maintenance.
  • Pm original author

Comments

See discussion at SimultaneousEdits-Talk.

User notes? : If you use, used or reviewed this recipe, you can add your name. These statistics appear in the Cookbook listings and will help newcomers browsing through the wiki.