Version 3.2.3

upload/ips_kernel/classMerge.php

@@ -2,17 +2,17 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Three Way Merge Class
- * Last Updated: $Date: 2009-02-04 20:03:59 +0000 (Wed, 04 Feb 2009) $ BY $author$
+ * Last Updated: $Date: 2011-03-11 12:41:48 -0500 (Fri, 11 Mar 2011) $ BY $author$
  * </pre>
  *
  * @author 		Matt Mecham
  * @copyright	(c) 2001 - 2010 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
- * @version		$Rev: 3887 $
+ * @link		http://hatynka.in
+ * @version		$Rev: 8042 $
  *
  */
 
@@ -22,25 +22,25 @@ class ThreeWayMerge
 	 * Original text
 	 * For example, template bit from 3.0.5
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_ORIG = array();
+	protected $_ORIG = array();
 	
 	/**
 	 * New text
 	 * For example, template bit from 3.1.0
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_NEW = array();
+	protected $_NEW = array();
 	
 	/**
 	 * Custom text
 	 * For example, user customized template bit
 	 *
-	 * @access	private
+	 * @access	protected
 	 */
-	private $_CUSTOM = array();
+	protected $_CUSTOM = array();
 	
 	/**
 	 * Debug messages
@@ -70,7 +70,7 @@ class ThreeWayMerge
 		}
 		
 		/* Set include path.. */
-		@set_include_path( IPS_KERNEL_PATH . 'PEAR/' );
+		@set_include_path( IPS_KERNEL_PATH . 'PEAR/' );/*noLibHook*/
 		
 		/* OMG.. too many PHP 5 errors under strict standards */
 		if ( IN_DEV )
@@ -86,15 +86,15 @@ class ThreeWayMerge
 		/* ugh */
 		if ( $this->diffType == 'lite' )
 		{
-			require_once 'Text/Diff3.php';
-			require_once 'Text/Diff/Renderer.php';
-			require_once 'Text/Diff/Renderer/inline.php';
+			require_once 'Text/Diff3.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer/inline.php';/*noLibHook*/
 		}
 		else
 		{
-			require_once 'Text/Diff.php';
-			require_once 'Text/Diff/Renderer.php';
-			require_once 'Text/Diff/Renderer/ips3waymerge.php';
+			require_once 'Text/Diff.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer.php';/*noLibHook*/
+			require_once 'Text/Diff/Renderer/ips3waymerge.php';/*noLibHook*/
 		}
 	}
 	
@@ -163,11 +163,11 @@ class ThreeWayMerge
 	/**
 	 * Post process merge (quick)
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		Merge text
 	 * @return	string		processed text
 	 */
-	private function _postProcessQuick( $text )
+	protected function _postProcessQuick( $text )
 	{
 		/* INIT */
 		$count = 0;
@@ -200,12 +200,12 @@ class ThreeWayMerge
 	 * Takes the two maps (old-new, old-custom) and merges.
 	 * Will throw an error on conflict.
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		old-new map
 	 * @param	array		old-custom map
 	 * @return	string
 	 */
-	private function _processMerge( $orig_new_map, $orig_custom_map )
+	protected function _processMerge( $orig_new_map, $orig_custom_map )
 	{
 		$len      = count( $this->_ORIG );
 		$c        = 0;
@@ -355,12 +355,12 @@ class ThreeWayMerge
 	/**
 	 * Returns an array slice for the ORIG line number X
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Re-processed Diff Array
 	 * @param	int			ORIG line number
 	 * @return	array
 	 */
-	private function _sliceFromLineNumber( $data, $n )
+	protected function _sliceFromLineNumber( $data, $n )
 	{
 		foreach ( $data as $i )
 		{
@@ -376,13 +376,13 @@ class ThreeWayMerge
 	/**
 	 * Returns an array of lines to add at the current ORIG line number X
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array		Re-processed Diff Array
 	 * @param	int			ORIG line number
 	 * @param	array 		Array to add to
 	 * @return	array
 	 */
-	private function _textToAddAtLine( $data, $n, $return=array(), $p='' )
+	protected function _textToAddAtLine( $data, $n, $return=array(), $p='' )
 	{
 		$return = ( is_array( $return ) AND count( $return ) ) ? $return : array();
 		
@@ -401,11 +401,11 @@ class ThreeWayMerge
 	 * Re-process DIFF.
 	 * Figures out mappings to original line numbers, etc
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	array 		Array of DIFF data
 	 * @return	array
 	 */
-	private function _fetchProcessed( $data, $log=0 )
+	protected function _fetchProcessed( $data, $log=0 )
 	{
 		/* Counter to ensure unique entry in $return */
 		$c = 0;
@@ -491,11 +491,11 @@ class ThreeWayMerge
 	/**
 	 * Add debug messages
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @param	string		TITLE
 	 * @param	mixed		Data
 	 */
-	private function _addDebugMsg( $title, $data )
+	protected function _addDebugMsg( $title, $data )
 	{
 		$this->_DEBUG[] = $title . "\n" . var_export( $data, TRUE );
 	}