Fix a bug where PhabricatorPasteQuery incorrectly rekeys results

Summary: I made changes here recently to improve robustness in the presence of missing files, but accidentally caused the results to re-key. Some callers depend on the mapping, and every other query is consistent about it. Restore the original behavior.

Test Plan: `Pnnn` works again in remarkup.

Reviewers: dctrwatson, chad

Reviewed By: chad

CC: aran

Differential Revision: https://secure.phabricator.com/D6134

Author: epriestley

src/applications/paste/query/PhabricatorPasteQuery.php

@@ -199,7 +199,7 @@ private function loadContent(array $pastes) {
       $key = $this->getContentCacheKey($paste);
       if (isset($caches[$key])) {
         $paste->attachContent(phutil_safe_html($caches[$key]));
-        $results[$key] = $paste;
+        $results[$paste->getID()] = $paste;
       } else {
         $need_raw[$key] = $paste;
       }
@@ -217,7 +217,7 @@ private function loadContent(array $pastes) {
       $paste->attachContent($content);
 
       $write_data[$this->getContentCacheKey($paste)] = (string)$content;
-      $results[$key] = $paste;
+      $results[$paste->getID()] = $paste;
     }
 
     $cache->setKeys($write_data);