Merge branch 'phutil_tag'

src/applications/differential/parser/DifferentialChangesetParser.php

@@ -63,7 +63,7 @@ final class DifferentialChangesetParser {
     return $this->disableCache;
   }
 
-  const CACHE_VERSION = 10;
+  const CACHE_VERSION = 11;
   const CACHE_MAX_SIZE = 8e6;
 
   const ATTR_GENERATED  = 'attr:generated';
@@ -270,7 +270,13 @@ final class DifferentialChangesetParser {
       return false;
     }
 
-    $data = json_decode($data['cache'], true);
+    if ($data['cache'][0] == '{') {
+      // This is likely an old-style JSON cache which we will not be able to
+      // deserialize.
+      return false;
+    }
+
+    $data = unserialize($data['cache']);
     if (!is_array($data) || !$data) {
       return false;
     }
@@ -340,7 +346,7 @@ final class DifferentialChangesetParser {
           break;
       }
     }
-    $cache = json_encode($cache);
+    $cache = serialize($cache);
 
     // We don't want to waste too much space by a single changeset.
     if (strlen($cache) > self::CACHE_MAX_SIZE) {

src/applications/differential/render/DifferentialChangesetHTMLRenderer.php

@@ -21,7 +21,7 @@ abstract class DifferentialChangesetHTMLRenderer
         return null;
       }
     } else {
-      $none = $none;
+      $none = hsprintf('');
       switch ($change) {
 
         case DifferentialChangeType::TYPE_ADD:

src/applications/project/controller/PhabricatorProjectProfileEditController.php

@@ -168,10 +168,12 @@ final class PhabricatorProjectProfileEditController
           ->setLabel(pht('Blurb'))
           ->setName('blurb')
           ->setValue($profile->getBlurb()))
-      ->appendChild('<p class="aphront-form-instructions">'.
-        pht('NOTE: Policy settings are not yet fully implemented. '.
-        'Some interfaces still ignore these settings, '.
-        'particularly "Visible To".').'</p>')
+      ->appendChild(hsprintf(
+        '<p class="aphront-form-instructions">%s</p>',
+        pht(
+          'NOTE: Policy settings are not yet fully implemented. '.
+          'Some interfaces still ignore these settings, '.
+          'particularly "Visible To".')))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($user)