--- /old/pub/skins/monobook/monobook.php   2016-02-11 01:51:44.000000000 +0100
+++ /new/pub/skins/monobook/monobook.php 2020-03-25 12:38:31.623273581 +0100
@@ -147,9 +147,3 @@
-if (function_exists('Markup_e')) {
- Markup_e('noleft', 'directives', '/\\(:noleft:\\)/i', "NoLeftBar()");
- Markup_e('nosidebar', 'directives', '/\\(:nosidebar:\\)/i', "NoLeftBar()");
- Markup_e('notabs', 'directives', '/\\(:no(action|tab)s?:\\)/i', "NoTabs()");
-} else {
- Markup('noleft', 'directives', '/\\(:noleft:\\)/ei', "NoLeftBar()");
- Markup('nosidebar', 'directives', '/\\(:nosidebar:\\)/ei', "NoLeftBar()");
- Markup('notabs', 'directives', '/\\(:no(action|tab)s?:\\)/ei', "NoTabs()");
-}
+Markup('noleft', 'directives', '/\\(:noleft:\\)/i', function() { NoLeftBar(); });
+Markup('nosidebar', 'directives', '/\\(:nosidebar:\\)/i', function() { NoLeftBar(); });
+Markup('notabs', 'directives', '/\\(:no(action|tab)s?:\\)/i', function() { NoTabs(); });
@@ -216,12 +210,2 @@
-  if (function_exists('Markup_e')) {
-    Markup_e('noright', 'directives', '/\\(:noright:\\)/',
-      "SetTmplDisplay('PageRightFmt', 0)");
-    Markup_e('showright', 'directives', '/\\(:showright:\\)/',
-     ($action != 'browse') ? "" : "SetTmplDisplay('PageRightFmt', 1)");
-  } else {
-    Markup('noright', 'directives', '/\\(:noright:\\)/e',
-      "SetTmplDisplay('PageRightFmt', 0)");
-    Markup('showright', 'directives', '/\\(:showright:\\)/e',
-       ($action != 'browse') ? "" : "SetTmplDisplay('PageRightFmt', 1)");
-  }
-
+  Markup('noright', 'directives', '/\\(:noright:\\)/', function() { SetTmplDisplay('PageRightFmt', 0); });
+  Markup('showright', 'directives', '/\\(:showright:\\)/', function() { global $action; ($action != 'browse') ? '' : SetTmplDisplay('PageRightFmt', 1); });