dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"
[lhc/web/wiklou.git]
/
includes
/
Storage
/
RevisionStore.php
diff --git
a/includes/Storage/RevisionStore.php
b/includes/Storage/RevisionStore.php
index
1d921e3
..
5b3daf4
100644
(file)
--- a/
includes/Storage/RevisionStore.php
+++ b/
includes/Storage/RevisionStore.php
@@
-283,7
+283,7
@@
class RevisionStore
* @param mixed $value
* @param string $name
*
* @param mixed $value
* @param string $name
*
- * @throw IncompleteRevisionException if $value is null
+ * @throw
s
IncompleteRevisionException if $value is null
* @return mixed $value, if $value is not null
*/
private function failOnNull( $value, $name ) {
* @return mixed $value, if $value is not null
*/
private function failOnNull( $value, $name ) {
@@
-300,7
+300,7
@@
class RevisionStore
* @param mixed $value
* @param string $name
*
* @param mixed $value
* @param string $name
*
- * @throw IncompleteRevisionException if $value is empty
+ * @throw
s
IncompleteRevisionException if $value is empty
* @return mixed $value, if $value is not null
*/
private function failOnEmpty( $value, $name ) {
* @return mixed $value, if $value is not null
*/
private function failOnEmpty( $value, $name ) {
@@
-724,11
+724,6
@@
class RevisionStore
'ar_content_model' => 'rev_content_model',
];
'ar_content_model' => 'rev_content_model',
];
- if ( empty( $archiveRow->ar_text_id ) ) {
- $fieldMap['ar_text'] = 'old_text';
- $fieldMap['ar_flags'] = 'old_flags';
- }
-
$revRow = new stdClass();
foreach ( $fieldMap as $arKey => $revKey ) {
if ( property_exists( $archiveRow, $arKey ) ) {
$revRow = new stdClass();
foreach ( $fieldMap as $arKey => $revKey ) {
if ( property_exists( $archiveRow, $arKey ) ) {
@@
-894,7
+889,7
@@
class RevisionStore
* @param string|null $blobFormat MIME type indicating how $dataBlob is encoded
* @param int $queryFlags
*
* @param string|null $blobFormat MIME type indicating how $dataBlob is encoded
* @param int $queryFlags
*
- * @throw RevisionAccessException
+ * @throw
s
RevisionAccessException
* @return Content
*/
private function loadSlotContent(
* @return Content
*/
private function loadSlotContent(
@@
-1706,7
+1701,6
@@
class RevisionStore
'ar_namespace',
'ar_title',
'ar_rev_id',
'ar_namespace',
'ar_title',
'ar_rev_id',
- 'ar_text',
'ar_text_id',
'ar_timestamp',
'ar_minor_edit',
'ar_text_id',
'ar_timestamp',
'ar_minor_edit',