Wordpress 3.6

[autoinstalls/wordpress.git] / wp-includes / Text / Diff / Renderer.php

diff --git a/wp-includes/Text/Diff/Renderer.php b/wp-includes/Text/Diff/Renderer.php
index 5d226b4e2163ec4e788e7acd838c8f4fd3221e58..95c6db4b897931c616775d320eca320468ceb3b8 100644 (file)
--- a/wp-includes/Text/Diff/Renderer.php
+++ b/wp-includes/Text/Diff/Renderer.php
@@ -5,9 +5,7 @@
  * This class renders the diff in classic diff format. It is intended that
  * this class be customized via inheritance, to obtain fancier outputs.
  *
  * This class renders the diff in classic diff format. It is intended that
  * this class be customized via inheritance, to obtain fancier outputs.
  *

- * $Horde: framework/Text_Diff/Diff/Renderer.php,v 1.21 2008/01/04 10:07:50 jan Exp $
- *
- * Copyright 2004-2008 The Horde Project (http://www.horde.org/)
+ * Copyright 2004-2010 The Horde Project (http://www.horde.org/)

  *
  * See the enclosed file COPYING for license information (LGPL). If you did
  * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
  * not receive this file, see http://opensource.org/licenses/lgpl-license.php.


@@ -100,7 +98,7 @@ class Text_Diff_Renderer {
                             /* Create a new block with as many lines as we need
                              * for the trailing context. */
                             $context = array_slice($edit->orig, 0, $ntrail);
                             /* Create a new block with as many lines as we need
                              * for the trailing context. */
                             $context = array_slice($edit->orig, 0, $ntrail);

-                            $block[] = &new Text_Diff_Op_copy($context);
+                            $block[] = new Text_Diff_Op_copy($context);

                         }
                         /* @todo */
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,
                         }
                         /* @todo */
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,


@@ -120,7 +118,7 @@ class Text_Diff_Renderer {
                     $y0 = $yi - count($context);
                     $block = array();
                     if ($context) {
                     $y0 = $yi - count($context);
                     $block = array();
                     if ($context) {

-                        $block[] = &new Text_Diff_Op_copy($context);
+                        $block[] = new Text_Diff_Op_copy($context);

                     }
                 }
                 $block[] = $edit;
                     }
                 }
                 $block[] = $edit;