TagAnno annoFormat is dead code.

kohler · Sep 8, 2023 · d9a1d6e · d9a1d6e
1 parent bd39cf2
commit d9a1d6e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/lib/tagger.php b/lib/tagger.php
@@ -328,11 +328,10 @@ function jsonSerialize() {
         }
         if ($this->heading !== null) {
             $j["legend"] = $this->heading; // XXX "heading" backward compat
-        }
-        if ($this->heading !== null
-            && $this->heading !== ""
-            && ($format = Conf::$main->check_format($this->annoFormat, $this->heading))) {
-            $j["format"] = +$format;
+            if ($this->heading !== ""
+                && ($format = Conf::$main->check_format(null, $this->heading))) {
+                $j["format"] = +$format;
+            }
         }
         if ($this->_props === null && $this->infoJson !== null) {
             $this->decode_props();

diff --git a/src/api/api_taganno.php b/src/api/api_taganno.php
@@ -78,9 +78,7 @@ static function set(Contact $user, Qrequest $qreq) {
             $qf = [];
             if (isset($anno->legend)) {
                 $qf[] = "heading=?";
-                $qf[] = "annoFormat=?";
                 $qv[] = $anno->legend;
-                $qv[] = null;
             }
             if (isset($anno->tagval)) {
                 $tagval = trim($anno->tagval);

diff --git a/src/papercolumns/pc_tag.php b/src/papercolumns/pc_tag.php
@@ -181,7 +181,7 @@ function content(PaperList $pl, PaperInfo $row) {
                    && $ta->heading !== "") {
             $h = htmlspecialchars($ta->heading);
             $k = "pltagheading";
-            if (($format = $pl->conf->check_format($ta->annoFormat, $ta->heading))) {
+            if (($format = $pl->conf->check_format(null, $ta->heading))) {
                 $k .= " need-format\" data-format\"{$format}";
                 $pl->need_render = true;
             }

diff --git a/src/paperlist.php b/src/paperlist.php
@@ -1677,11 +1677,10 @@ private function _mark_groups_html($grouppos, $rstate, &$body, $last) {
                 $x = "<span class=\"plheading-group";
                 if ($ginfo->heading !== "") {
                     $x .= " pr-2";
-                }
-                if ($ginfo->heading !== ""
-                    && ($format = $this->conf->check_format($ginfo->annoFormat, $ginfo->heading))) {
-                    $x .= " need-format\" data-format=\"{$format}";
-                    $this->need_render = true;
+                    if (($format = $this->conf->check_format(null, $ginfo->heading))) {
+                        $x .= " need-format\" data-format=\"{$format}";
+                        $this->need_render = true;
+                    }
                 }
                 $x .= "\" data-title=\"" . htmlspecialchars($ginfo->heading)
                     . "\">" . htmlspecialchars($ginfo->heading)