[phpwiki-checkins] SF.net SVN: phpwiki:[9743] trunk

[<var...@us...>]

Revision: 9743
          http://sourceforge.net/p/phpwiki/code/9743
Author:   vargenau
Date:     2015-12-11 09:54:49 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
Make functions merged and is_conflict public in lib/diff3.php (support request #162)

Modified Paths:
--------------
    trunk/lib/diff3.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php	2015-12-10 17:55:35 UTC (rev 9742)
+++ trunk/lib/diff3.php	2015-12-11 09:54:49 UTC (rev 9743)
@@ -36,7 +36,7 @@
         return $this->_merged;
     }
 
-    protected function is_conflict()
+    public function is_conflict()
     {
         return $this->merged() === false;
     }
@@ -53,12 +53,12 @@
         $this->final2 = &$this->orig;
     }
 
-    protected function merged()
+    public function merged()
     {
         return $this->orig;
     }
 
-    protected function is_conflict()
+    public function is_conflict()
     {
         return false;
     }

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015-12-10 17:55:35 UTC (rev 9742)
+++ trunk/pgsrc/ReleaseNotes	2015-12-11 09:54:49 UTC (rev 9743)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Fri, 11 Dec 2015 10:53:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -17,7 +17,7 @@
 * Remove forbidden characters: ~<~>~[~]~{~}~"~|~# from pagename
 * New property: ALLOWED_LOAD giving list of directories from which it is allowed to load pages.
 * Upload: replace multiple spaces by single space
-* Make function merged public lib/diff3.php (support request #162)
+* Make functions merged and is_conflict public in lib/diff3.php (support request #162)
 
 == 1.5.4 2015-06-29 Marc-Etienne Vargenau ==
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.