Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2
This commit is contained in:
parent
9eae24d844
commit
28556d630e
1322 changed files with 6699 additions and 2064 deletions
|
@ -453,4 +453,5 @@ class DiffEngine {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,9 +8,9 @@ namespace Drupal\Component\Diff\Engine;
|
|||
* @subpackage DifferenceEngine
|
||||
*/
|
||||
class DiffOp {
|
||||
var $type;
|
||||
var $orig;
|
||||
var $closing;
|
||||
public $type;
|
||||
public $orig;
|
||||
public $closing;
|
||||
|
||||
public function reverse() {
|
||||
trigger_error('pure virtual', E_USER_ERROR);
|
||||
|
@ -23,4 +23,5 @@ class DiffOp {
|
|||
public function nclosing() {
|
||||
return $this->closing ? sizeof($this->closing) : 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
|
|||
* @subpackage DifferenceEngine
|
||||
*/
|
||||
class DiffOpAdd extends DiffOp {
|
||||
var $type = 'add';
|
||||
public $type = 'add';
|
||||
|
||||
public function __construct($lines) {
|
||||
$this->closing = $lines;
|
||||
|
@ -18,4 +18,5 @@ class DiffOpAdd extends DiffOp {
|
|||
public function reverse() {
|
||||
return new DiffOpDelete($this->closing);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
|
|||
* @subpackage DifferenceEngine
|
||||
*/
|
||||
class DiffOpChange extends DiffOp {
|
||||
var $type = 'change';
|
||||
public $type = 'change';
|
||||
|
||||
public function __construct($orig, $closing) {
|
||||
$this->orig = $orig;
|
||||
|
@ -18,4 +18,5 @@ class DiffOpChange extends DiffOp {
|
|||
public function reverse() {
|
||||
return new DiffOpChange($this->closing, $this->orig);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
|
|||
* @subpackage DifferenceEngine
|
||||
*/
|
||||
class DiffOpCopy extends DiffOp {
|
||||
var $type = 'copy';
|
||||
public $type = 'copy';
|
||||
|
||||
public function __construct($orig, $closing = FALSE) {
|
||||
if (!is_array($closing)) {
|
||||
|
@ -21,4 +21,5 @@ class DiffOpCopy extends DiffOp {
|
|||
public function reverse() {
|
||||
return new DiffOpCopy($this->closing, $this->orig);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ namespace Drupal\Component\Diff\Engine;
|
|||
* @subpackage DifferenceEngine
|
||||
*/
|
||||
class DiffOpDelete extends DiffOp {
|
||||
var $type = 'delete';
|
||||
public $type = 'delete';
|
||||
|
||||
public function __construct($lines) {
|
||||
$this->orig = $lines;
|
||||
|
@ -18,4 +18,5 @@ class DiffOpDelete extends DiffOp {
|
|||
public function reverse() {
|
||||
return new DiffOpAdd($this->orig);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -5,8 +5,7 @@ namespace Drupal\Component\Diff\Engine;
|
|||
use Drupal\Component\Utility\Unicode;
|
||||
|
||||
/**
|
||||
* Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
|
||||
*
|
||||
* Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
|
||||
*/
|
||||
|
||||
/**
|
||||
|
@ -76,4 +75,5 @@ class HWLDFWordAccumulator {
|
|||
$this->_flushLine('~done');
|
||||
return $this->lines;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Reference in a new issue