| Property changes on: branches/REL1_15/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328 |
| 2 | 2 | + /trunk/phase3/includes/api:48813-48814,48819,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470 |
| Index: branches/REL1_15/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -1141,7 +1141,7 @@ |
| 1142 | 1142 | // If revision was hidden from sysops |
| 1143 | 1143 | $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml('rev-delundel').')' ); |
| 1144 | 1144 | } else { |
| 1145 | | - $query = array( 'target' => $this->mTargetObj->getPrefixedUrl(), |
| | 1145 | + $query = array( 'target' => $this->mTargetObj->getPrefixedDBkey(), |
| 1146 | 1146 | 'artimestamp[]' => $ts |
| 1147 | 1147 | ); |
| 1148 | 1148 | $revdlink = $sk->revDeleteLink( $query, $rev->isDeleted( Revision::DELETED_RESTRICTED ) ); |
| — | — | @@ -1183,7 +1183,7 @@ |
| 1184 | 1184 | // If revision was hidden from sysops |
| 1185 | 1185 | $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml('rev-delundel').')' ); |
| 1186 | 1186 | } else { |
| 1187 | | - $query = array( 'target' => $this->mTargetObj->getPrefixedUrl(), |
| | 1187 | + $query = array( 'target' => $this->mTargetObj->getPrefixedDBkey(), |
| 1188 | 1188 | 'fileid' => $row->fa_id |
| 1189 | 1189 | ); |
| 1190 | 1190 | $revdlink = $sk->revDeleteLink( $query, $file->isDeleted( File::DELETED_RESTRICTED ) ); |
| Property changes on: branches/REL1_15/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1191 | 1191 | - /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328 |
| /trunk/phase3/includes/specials/specials:48993 |
| 1192 | 1192 | + /trunk/phase3/includes/specials:48836,48886,48892,48989,48992-48993,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470 |
| /trunk/phase3/includes/specials/specials:48993 |
| Property changes on: branches/REL1_15/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1193 | 1193 | - /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328 |
| /trunk/phase3/includes/specials:48993 |
| 1194 | 1194 | + /trunk/phase3/includes:48836,48886,48892,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470 |
| /trunk/phase3/includes/specials:48993 |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1195 | 1195 | - /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328 |
| 1196 | 1196 | + /trunk/phase3:48814,48836,48886,48892,48909,48989,48992,49002,49051,49068,49086,49191-49192,49212,49682,49685,49730,49775,49954,49956,49999,50041,50054,50070,50132,50134,50169,50215,50218,50328,50470 |