[phpwiki-checkins] SF.net SVN: phpwiki:[9737] branches/release-1.5.4/lib/diff3.php

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

Revision: 9737
          http://sourceforge.net/p/phpwiki/code/9737
Author:   vargenau
Date:     2015-12-10 17:40:05 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
Make function merged public

Modified Paths:
--------------
    branches/release-1.5.4/lib/diff3.php

Modified: branches/release-1.5.4/lib/diff3.php
===================================================================
--- branches/release-1.5.4/lib/diff3.php	2015-12-08 09:48:35 UTC (rev 9736)
+++ branches/release-1.5.4/lib/diff3.php	2015-12-10 17:40:05 UTC (rev 9737)
@@ -21,14 +21,16 @@
         $this->final2 = $final2 ? $final2 : array();
     }
 
-    protected function merged()
+    public function merged()
     {
         if (!isset($this->_merged)) {
             if ($this->final1 === $this->final2)
                 $this->_merged = &$this->final1;
             elseif ($this->final1 === $this->orig)
-                $this->_merged = &$this->final2; elseif ($this->final2 === $this->orig)
-                $this->_merged = &$this->final1; else
+                $this->_merged = &$this->final2;
+            elseif ($this->final2 === $this->orig)
+                $this->_merged = &$this->final1;
+            else
                 $this->_merged = false;
         }
         return $this->_merged;

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