org.el: Make orgstruct++-mode overwrite local non-org vars again.

* org.el (orgstruct++-mode): Overwrite local non-org vars again.

lisp/org.el

@@ -8877,6 +8877,8 @@ buffer.  It will also recognize item context in multiline items."
 		   org-fb-vars))
     (orgstruct-mode 1)
     (setq org-fb-vars nil)
+    (unless org-local-vars
+      (setq org-local-vars (org-get-local-variables)))
     (let (var val)
       (mapc
        (lambda (x)