remove support for _cautionList

dokuwiki · Jun 1, 2018 · f74addc · f74addc
1 parent b71f246
commit f74addc
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/lib/plugins/config/core/Setting/Setting.php b/lib/plugins/config/core/Setting/Setting.php
@@ -282,23 +282,13 @@ public function hasError() {
      * @return false|string caution string, otherwise false for invalid caution
      */
     public function caution() {
-        if(!empty($this->caution)) {
-            if(!in_array($this->caution, Setting::$validCautions)) {
-                throw new \RuntimeException(
-                    'Invalid caution string (' . $this->caution . ') in metadata for setting "' . $this->key . '"'
-                );
-            }
-            return $this->caution;
-        }
-        // compatibility with previous cautionList
-        // TODO: check if any plugins use; remove
-        if(!empty($this->cautionList[$this->key])) {
-            $this->caution = $this->cautionList[$this->key];
-            unset($this->cautionList);
-
-            return $this->caution();
+        if(empty($this->caution)) return false;
+        if(!in_array($this->caution, Setting::$validCautions)) {
+            throw new \RuntimeException(
+                'Invalid caution string (' . $this->caution . ') in metadata for setting "' . $this->key . '"'
+            );
         }
-        return false;
+        return $this->caution;
     }
 
 }