Merge "page: Avoid deprecated wfMemcKey()"

diff --combined includes/page/WikiPage.php
index 5f8da15,e535617..7489f44
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1177,7 -1177,7 +1177,7 @@@ class WikiPage implements Page, IDBAcce
                );
  
                if ( $dbw->affectedRows() > 0 ) {
 -                      $newid = $pageId ?: $dbw->insertId();
 +                      $newid = $pageId ? (int)$pageId : $dbw->insertId();
                        $this->mId = $newid;
                        $this->mTitle->resetArticleID( $newid );
  
@@@ -2901,8 -2901,8 +2901,8 @@@
                $status->value = $logid;
  
                // Show log excerpt on 404 pages rather than just a link
-               $cache = ObjectCache::getMainStashInstance();
-               $key = wfMemcKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
+               $cache = MediaWikiServices::getInstance()->getMainObjectStash();
+               $key = $cache->makeKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
                $cache->set( $key, 1, $cache::TTL_DAY );
  
                return $status;