com web/pres2: Get rid of /e: pres2reveal

[email protected] (Rasmus Lerdorf) Sun, 08 Mar 2015 18:58:08 +0000
Newsgroups php.pres
Message-ID <[email protected]>
Commit:    b8b94cdd8856a0067e3add9b68f0b387f946ab28
Author:    Rasmus Lerdorf <[email protected]>         Sun, 8 Mar 2015 11:58:08 -0700
Parents:   17bdd00c2ea5391fb6ae01859bd3c2ab252613cd
Branches:  master

Link:       http://git.php.net/?p=web/pres2.git;a=commitdiff;h=b8b94cdd8856a0067e3add9b68f0b387f946ab28

Log:
Get rid of /e

Changed paths:
  M  pres2reveal


Diff:
diff --git a/pres2reveal b/pres2reveal
index b562a66..f20fcfb 100755
--- a/pres2reveal
+++ b/pres2reveal
@@ -245,6 +245,7 @@ function markup_text($str) {
     $ret = preg_replace('/TAB\//',' ',$ret);
 
     $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
-    $ret = preg_replace('/:-:(.*?):-:/e','$pres->\\1',$ret);
+#    $ret = @preg_replace('/:-:(.*?):-:/e','$pres->\\1',$ret);
+    $ret = preg_replace_callback('/:-:(.*?):-:/', function($m) { global $pres; return $pres->{$m[1]}; }, $ret);
     return $ret;
 }