| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php |
| — | — | @@ -718,11 +718,7 @@ |
| 719 | 719 | wfProfileIn( 'SMWSQLStore2::deleteSubject (SMW)' ); |
| 720 | 720 | wfRunHooks( 'SMWSQLStore2::deleteSubjectBefore', array( $this, $subject ) ); |
| 721 | 721 | |
| 722 | | - $this->deleteSemanticData( new SMWDIWikiPage( |
| 723 | | - $subject->getDBkey(), |
| 724 | | - $subject->getNamespace(), |
| 725 | | - $subject->getInterwiki() |
| 726 | | - ) ); |
| | 722 | + $this->deleteSemanticData( SMWDIWikiPage::newFromTitle( $subject ); |
| 727 | 723 | $this->updateRedirects( $subject->getDBkey(), $subject->getNamespace() ); // also delete redirects, may trigger update jobs! |
| 728 | 724 | |
| 729 | 725 | if ( $subject->getNamespace() == SMW_NS_CONCEPT ) { // make sure to clear caches |
| — | — | @@ -970,11 +966,7 @@ |
| 971 | 967 | } else { // general move method that should be correct in all cases (equality support respected when updating redirects) |
| 972 | 968 | // Delete any existing data from new title: |
| 973 | 969 | // $newtitle should not have data, but let's be sure |
| 974 | | - $this->deleteSemanticData( new SMWDIWikiPage( |
| 975 | | - $newtitle->getDBkey(), |
| 976 | | - $newtitle->getNamespace(), |
| 977 | | - $subject->getInterwiki() |
| 978 | | - ) ); |
| | 970 | + $this->deleteSemanticData( SMWDIWikiPage::newFromTitle( $newtitle ); |
| 979 | 971 | $this->updateRedirects( $newtitle->getDBkey(), $newtitle->getNamespace() ); // may trigger update jobs! |
| 980 | 972 | |
| 981 | 973 | // Move all data of old title to new position: |
| — | — | @@ -1503,7 +1495,7 @@ |
| 1504 | 1496 | } |
| 1505 | 1497 | } elseif ( $row->smw_iw { 0 } != ':' ) { // refresh all "normal" interwiki pages by just clearing their content |
| 1506 | 1498 | $this->deleteSemanticData( |
| 1507 | | - new SMWDIWikiPage( $row->smw_namespace, $row->smw_title, $row->smw_iw ) |
| | 1499 | + new SMWDIWikiPage( $row->smw_title, $row->smw_namespace, $row->smw_iw ) |
| 1508 | 1500 | ); |
| 1509 | 1501 | } |
| 1510 | 1502 | } |