Hannes Kirsman
--- a/highlight_php.module
+++ b/highlight_php.module
-        $result = $hl->highlightAuto($node->textContent);
-      }
-      elseif ($mode === 'manual' && $regex) {
-        preg_match($regex, $document->saveHTML($node), $matches);
-        if (isset($matches[1])) {
-          $result = $hl->highlight($matches[1], $node->textContent);
+    if ($mode === 'auto') {
+      $hl->setAutodetectLanguages(explode(' ', trim($config->get('auto_languages') ?? 'php javascript')));
+    }
+
+    $document = Html::load($html);
+    $xpath = new \DOMXPath($document);
+    $modified = FALSE;
+
+    /** @var \DOMElement $node */
+    foreach ($xpath->query('//code[not(ancestor::code)]') as $node) {