Changeset 1164 for trunk

Timestamp:

01/14/12 16:18:10 (4 months ago)

Author:

bogdan2412

Message:

Make infoarena compatible with HPHP.

• Implemented APC caching support since eaccelerator is not compatible with HPHP and although we support memcached, we do not use it on live.
• Replaced instances of create_function_cached with php anonymous functions. This bumps the PHP version requirement to 5.3, but it allows the code to work with HPHP, since dynamic function generation is replaced with staticly analyzable functions. This also removes a horrible, terrible hack in Textile.php which was storing the current instance of the Textile class being processed as a static variable so that it could be accessed by anonymous functions.
• Replaced occurrences of assert with log_assert.
• When running under HPHP, IA_HPHP_ENV is defined and is used to bypass some incompatible code (redundant ini configuration checks).
• Fixed some includes that were dependent on the working directory being www/
• Included a sample HPHP configuration file and a Makefile with compilation commands.

REVIEW URL: ​http://reviewboard.infoarena.ro/r/182/

Location:

trunk

Files:

• Makefile (added)
• common/cache.php (modified) (2 diffs)
• common/common.php (modified) (1 diff)
• common/db/attachment.php (modified) (3 diffs)
• common/textblock.php (modified) (1 diff)
• hphp (added)
• hphp/config.hdf.sample (added)
• hphp/endpoint (added)
• hphp/endpoint/index.php (added)
• www/config.php (modified) (1 diff)
• www/format/pager.php (modified) (1 diff)
• www/htaccess.sample (modified) (1 diff)
• www/identity.php (modified) (1 diff)
• www/index.php (modified) (1 diff)
• www/macros/macro_rankings.php (modified) (4 diffs)
• www/macros/macro_tasks.php (modified) (1 diff)
• www/macros/macro_toprated.php (modified) (1 diff)
• www/utilities.php (modified) (1 diff)
• www/views/json.php (modified) (1 diff)
• www/views/listattach.php (modified) (5 diffs)
• www/views/monitor.php (modified) (1 diff)
• www/views/projector.php (modified) (1 diff)
• www/views/round_edit.php (modified) (2 diffs)
• www/views/round_register.php (modified) (1 diff)
• www/views/round_register_view.php (modified) (1 diff)
• www/views/round_task_order.php (modified) (1 diff)
• www/views/round_unregister.php (modified) (1 diff)
• www/views/task_edit.php (modified) (1 diff)
• www/views/task_filter_results.php (modified) (1 diff)
• www/views/task_rating_edit.php (modified) (2 diffs)
• www/views/textblock_edit.php (modified) (1 diff)
• www/views/textblock_history.php (modified) (3 diffs)
• www/wiki/Textile.php (modified) (23 diffs)

trunk/common/cache.php

@@ -144 +144 @@
 //      mem_cache_purge deletes everything from the cache. Try to avoid calling it.
 //
-// FIXME: cache is not logged. See IA_LOG_MEM_CACHE.
 if (IA_MEM_CACHE_METHOD == 'none') {
 
@@ -259 +258 @@
         }
     }
+
+} else if (IA_MEM_CACHE_METHOD == 'apc') {
+    // APC cache implementation
+    function mem_cache_get($cache_id) {
+        $res = apc_fetch($cache_id);
+        if ($res === false) {
+            if (IA_LOG_MEM_CACHE) {
+                log_print("MEM CACHE: miss on $cache_id");
+            }
+            return false;
+        } else {
+            if (IA_LOG_MEM_CACHE) {
+                log_print("MEM CACHE: hit on $cache_id");
+            }
+            return unserialize($res);
+        }
+    }
+
+    function mem_cache_set($cache_id, $object, $ttl = IA_MEM_CACHE_EXPIRATION) {
+        log_assert($object !== 'false', "Can't cache false values");
+        apc_store($cache_id, serialize($object), $ttl);
+
+        if (IA_LOG_MEM_CACHE) {
+            log_print("MEM CACHE: store $cache_id");
+        }
+        return $object;
+    }
+
+    function mem_cache_delete($cache_id) {
+        apc_delete($cache_id);
+        if (IA_LOG_MEM_CACHE) {
+            log_print("MEM CACHE: delete $cache_id");
+        }
+    }
+
+    function mem_cache_purge() {
+        if (IA_LOG_MEM_CACHE) {
+            log_print("MEM CACHE: purge");
+        }
+        apc_clear_cache();
+    }
 }
 

trunk/common/common.php

@@ -332 +332 @@
 
     // Check for retarded php.ini settings.
-    if (IA_HTTP_ENV) {
+    if (IA_HTTP_ENV && !defined('IA_HPHP_ENV')) {
         log_assert(!ini_get("session.auto_start"),
                    "Please disable session.auto_start. It kills babies!");

trunk/common/db/attachment.php

@@ -151 +151 @@
 // You may use % as a wildcard
 function attachment_get_all($page, $name='%', $start = 0, $count = 99999999) {
-    assert(is_whole_number($start));
-    assert(is_whole_number($count));
+    log_assert(is_whole_number($start));
+    log_assert(is_whole_number($count));
     $query = sprintf("SELECT ia_file.*, ia_user.username, ia_user.full_name as user_fullname
                       FROM ia_file
@@ -165 +165 @@
 // _count for the above.
 function attachment_get_count($page, $name='%', $start = 0, $count = 99999999) {
-    assert(is_whole_number($start));
-    assert(is_whole_number($count));
+    log_assert(is_whole_number($start));
+    log_assert(is_whole_number($count));
     $query = sprintf("SELECT COUNT(*)
                       FROM ia_file
@@ -184 +184 @@
 // FIXME: does this belong here?
 function attachment_get_filepath($attach) {
-    assert(is_array($attach));
+    log_assert(is_array($attach));
     return IA_ROOT_DIR.'attach/'.
             strtolower(preg_replace('/[^a-z0-9\.\-_]/i', '_', $attach['page'])) . '_' .

trunk/common/textblock.php

@@ -152 +152 @@
 function textblock_copy_replace($srcprefix, $dstprefix, $replace, $security,
         $user_id, $remote_ip_info = null) {
-    assert($srcprefix != $dstprefix);
-    assert($security === null || is_textblock_security_descriptor($security));
-    assert(is_whole_number($user_id));
+    log_assert($srcprefix != $dstprefix);
+    log_assert($security === null ||
+               is_textblock_security_descriptor($security));
+    log_assert(is_whole_number($user_id));
 
     $textblocks = textblock_get_by_prefix($srcprefix, true, false);

trunk/www/config.php

@@ -16 +16 @@
 
 // maximum attachment size for wiki pages
-define("IA_ATTACH_MAXSIZE", 70*1024*1024);
+define("IA_ATTACH_MAXSIZE", 64*1024*1024);
 
 // maximum jobs to reeval

trunk/www/format/pager.php

@@ -127 +127 @@
     $access_keys = getattr($options, 'use_digit_access_keys', true);
 
-    assert(is_whole_number($display_entries));
-    assert(is_whole_number($first_entry));
-    assert(is_whole_number($total_entries));
+    log_assert(is_whole_number($display_entries));
+    log_assert(is_whole_number($first_entry));
+    log_assert(is_whole_number($total_entries));
 
     $curpage = (int)($first_entry / $display_entries);

trunk/www/htaccess.sample

@@ -34 +34 @@
 php_value log_errors true
 php_value html_errors false
-php_value memory_limit "16M"
-php_value post_max_size "71M"
-php_value upload_max_filesize "70M"
-
+php_value memory_limit "64M"
+php_value post_max_size "65M"
+php_value upload_max_filesize "64M"

trunk/www/identity.php

@@ -115 +115 @@
         session_set_cookie_params(0, '/', IA_COOKIE_DOMAIN);
     }
-    session_start();
+    if (defined('IA_HPHP_ENV')) {
+        // FIXME: Raises PHP Warning: Constant SID already defined when
+        // init_php_session is called a second time.
+        @session_start();
+    } else {
+        session_start();
+    }
 }
 

trunk/www/index.php

@@ -1 +1 @@
 <?php
-require_once("../config.php");
+if (!defined('IA_HPHP_ENV')) {
+    require_once("../config.php");
+}
 require_once(IA_ROOT_DIR."www/config.php");
 require_once(IA_ROOT_DIR."common/log.php");

trunk/www/macros/macro_rankings.php

@@ -67 +67 @@
         array(
             'title' => 'Pozitie',
-            'key' => 'pos',
-            'rowform' => create_function_cached('$row', 'return $row["ranking"];'),
+            'key' => 'ranking',
             'css_class' => 'number rank'
         ),
@@ -74 +73 @@
             'title' => 'Nume',
             'key' => 'user_full',
-            'rowform' => create_function_cached('$row',
-                'return format_user_normal($row["user_name"], $row["user_full"], $row["user_rating"]);'),
+            'rowform' => function($row) {
+                return format_user_normal($row['user_name'], $row['user_full'], $row['user_rating']);
+            },
         ),
     );
@@ -111 +111 @@
             'title' => $column['title'],
             'key' => $column['name'],
-            'rowform' => create_function_cached('$row', 'return round($row[\''.$column['name'].'\']);'),
+            'rowform' => function($row) use ($column) {
+                return round($row[$column['name']]);
+            },
             'css_class' => 'number score'
         ));
@@ -123 +125 @@
         'title' => $total,
         'key' => 'score',
-        'rowform' => create_function_cached('$row', 'return round($row[\'score\']);'),
+        'rowform' => function($row) {
+            return round($row['score']);
+        },
         'css_class' => 'number score'
     ));

trunk/www/macros/macro_tasks.php

@@ -176 +176 @@
                 'title' => 'Număr',
                 'css_class' => 'number',
-                'rowform' => create_function_cached('$row',
-                        'return str_pad($row["order"] - 1, 3, \'0\', STR_PAD_LEFT);'),
+                'rowform' => function($row) {
+                    return str_pad($row["order"] - 1, 3, '0', STR_PAD_LEFT);
+                },
         );
     }

trunk/www/macros/macro_toprated.php

@@ -32 +32 @@
             'title' => 'Nume',
             'key' => 'full_name',
-            'rowform' => create_function_cached('$row',
-                                         'return format_user_normal($row["username"], $row["full_name"], $row["rating_cache"]);'),
+            'rowform' => function($row) {
+                return format_user_normal($row['username'], $row['full_name'], $row['rating_cache']);
+            },
         ),
         array(
             'title' => 'Rating',
             'key' => 'rating_cache',
-            'rowform' => create_function_cached('$row', 'return rating_scale($row[\'rating_cache\']);'),
+            'rowform' => function($row) {
+                return rating_scale($row['rating_cache']);
+            },
             'css_class' => 'number rating',
         ),

trunk/www/utilities.php

@@ -242 +242 @@
     // warnings about function redeclaration.
     include($view_file_name);
-    //include('views/vardump.php');
 }
 

trunk/www/views/json.php

@@ -5 +5 @@
 // encode JSON
 $json = new Services_JSON();
-assert($view['json']);
+log_assert($view['json']);
 $output = $json->encode($view['json']);
 

trunk/www/views/listattach.php

@@ -1 @@
-<?php 
+<?php
 include('header.php');
 require_once(IA_ROOT_DIR . "www/format/table.php");
@@ -5 +5 @@
 
 ?>
-    
+
 <script type="text/javascript">
     function rename_form(id) {
@@ -12 +12 @@
             document.getElementById("link_"+id).style.display = "none";
             document.getElementById("rename_link_"+id).textContent = "Anuleaza";
-        } 
+        }
         else {
             document.getElementById("rename_"+id).style.display = "none";
@@ -73 +73 @@
 function format_operations($row) {
     global $page_name;
-    
+
     $delurl = format_post_link(url_attachment_delete($page_name, $row['name']),
                                "Sterge", array(), true,
@@ -103 +103 @@
         'title' => 'Utilizator',
         'key' => 'username',
-        'rowform' => create_function_cached('$row',
-                'return format_user_tiny($row["username"], $row["user_fullname"]);'),
+        'rowform' => function($row) {
+            return format_user_tiny($row['username'], $row['user_fullname']);
+        },
     ),
     array(

trunk/www/views/monitor.php

@@ -152 +152 @@
             'title' => 'Utilizator',
             'key' => 'username',
-            'rowform' => create_function_cached('$row',
-                 'return format_user_tiny($row["user_name"], $row["user_fullname"]);'),
+            'rowform' => function($row) {
+                return format_user_tiny($row['user_name'], $row['user_fullname']);
+            },
         ),
         array(

trunk/www/views/projector.php

@@ -89 +89 @@
             'title' => 'Utilizator',
             'key' => 'username',
-            'rowform' => create_function_cached('$row',
-                 'return format_user_tiny($row["user_name"], $row["user_fullname"]);'),
+            'rowform' => function($row) {
+                 return format_user_tiny($row['user_name'], $row['user_fullname']);
+            },
         ),
         array(

trunk/www/views/round_edit.php

@@ -12 +12 @@
 require_once(IA_ROOT_DIR."www/format/form.php");
 require_once(IA_ROOT_DIR."www/views/round_edit_header.php");
-include('views/header.php');
+include('header.php');
 
 echo round_edit_tabs($view['round_id'], 'round-edit-params');
@@ -18 +18 @@
 $can_tag = identity_can('round-tag', $round);
 if ($can_tag) {
-    include('views/tags_header.php');
+    include('tags_header.php');
 }
 

trunk/www/views/round_register.php

@@ -1 +1 @@
 <?php
-include('views/header.php');
+include('header.php');
 ?>
 

trunk/www/views/round_register_view.php

@@ -15 +15 @@
         array(
             'title' => 'Pozitie',
-            'rowform' => create_function_cached('$row', 'return $row["position"];'),
+            'key' => 'position',
             'css_class' => 'number rank',
         ),
         array(
             'title' => 'Nume',
-            'rowform' => create_function_cached('$row',
-                                         'return format_user_normal($row["username"], $row["fullname"], $row["rating"]);'),
+            'rowform' => function($row) {
+                return format_user_normal($row['username'], $row['fullname'], $row['rating']);
+            },
         ),
         array(
             'title' => 'Rating',
-            'rowform' => create_function_cached('$row', 'return rating_scale($row["rating"]);'),
+            'rowform' => function($row) {
+                return rating_scale($row['rating']);
+            },
             'css_class' => 'number rating'
         ),

trunk/www/views/round_task_order.php

@@ -4 +4 @@
 require_once(IA_ROOT_DIR."www/views/round_edit_header.php");
 require_once(IA_ROOT_DIR."www/macros/macro_tasks.php");
-include("views/header.php");
+include('header.php');
 
 echo round_edit_tabs($view['round_id'], 'round-edit-task-order');

trunk/www/views/round_unregister.php

@@ -1 +1 @@
 <?php
-include('views/header.php');
+include('header.php');
 ?>
 

trunk/www/views/task_edit.php

@@ -8 +8 @@
     "<script type=\"text/javascript\" src=\"" . html_escape(url_static("js/parameditor.js")) . "\"></script>";
 
-include('views/header.php');
-include('views/tags_header.php');
+include('header.php');
+include('tags_header.php');
 
 echo task_edit_tabs($view['task_id'], request("action"));

trunk/www/views/task_filter_results.php

@@ -109 +109 @@
         'title' => 'Număr',
         'css_class' => 'number',
-        'rowform' => create_function_cached('$row',
-        'return str_pad($row["order"] - 1, 3, \'0\', STR_PAD_LEFT);'));
+        'rowform' => function($row) {
+            return str_pad($row["order"] - 1, 3, '0', STR_PAD_LEFT);
+        });
 
 $column_infos[] = array(

trunk/www/views/task_rating_edit.php

@@ -4 +4 @@
 require_once(IA_ROOT_DIR . "www/views/task_edit_header.php");
 
-include('views/header.php');
+include('header.php');
 
 echo task_edit_tabs($view['task_id'], request("action"));
@@ -53 +53 @@
 </form>
 
-<?php include('views/footer.php');
+<?php include('footer.php');

trunk/www/views/textblock_edit.php

@@ -4 +4 @@
 $view['head'] = getattr($view, 'head')."<script type=\"text/javascript\" src=\"" . html_escape(url_static("js/wikiedit.js")) . "\"></script>";
 
-include('views/header.php');
-include('views/tags_header.php');
+include('header.php');
+include('tags_header.php');
 
 // insert task edit tabs

trunk/www/views/textblock_history.php

@@ -84 +84 @@
         'title' => 'Utilizator',
         'key' => 'username',
-        'rowform' => create_function_cached('$row',
-                'return format_user_tiny($row["user_name"], $row["user_fullname"], $row["rating_cache"]);'),
+        'rowform' => function($row) {
+            return format_user_tiny($row['user_name'], $row['user_fullname'], $row['rating_cache']);
+        },
     ),
     array(
@@ -119 +120 @@
 );
 
-?>                                                         
+?>
 
 <form
@@ -153 +154 @@
 </form>
 
-<?php include('footer.php'); ?> 
+<?php include('footer.php'); ?>

trunk/www/wiki/Textile.php

@@ -773 +773 @@
 
     // preserve contents of the '==', 'pre', 'blockcode' sections
+    $me =& $this;
     $str = preg_replace_callback('/( (?<=\n\n)== | (?<=^)== )  (.+?)  ( ==(?=\n\n) | ==(?=$) )  /sx',
-                                 $this->_cb('$me->_repl($me->repl[0], $me->format_block(array("text" => $m[2])))'), $str);
+                                 function($m) use ($me) {
+                                   return $me->_repl($me->repl[0], $me->format_block(array("text" => $m[2])));
+                                 }, $str);
 
     if (!$this->disable_html()) {
       // preserve style, script tag contents
-      $str = preg_replace_callback('!(<(style|script)(?:>| .+?>).*?</\2>)!s', $this->_cb('$me->_repl($me->repl[0], $m[1])'), $str);
+      $str = preg_replace_callback('!(<(style|script)(?:>| .+?>).*?</\2>)!s',
+                                   function($m) use ($me) {
+                                     return $me->_repl($me->repl[0], $m[1]);
+                                   }, $str);
 
       // preserve HTML comments
-      $str = preg_replace_callback('|(<!--.+?-->)|s', $this->_cb('$me->_repl($me->repl[0], $m[1])'), $str);
+      $str = preg_replace_callback('|(<!--.+?-->)|s',
+                                   function($m) use ($me) {
+                                     return $me->_repl($me->repl[0], $m[1]);
+                                   }, $str);
 
       // preserve pre block contents, encode contents by default
       $pre_start = count($this->repl[0]);
       $str = preg_replace_callback('{(<pre(?: [^>]*)?>)(.+?)(</pre>)}s',
-                                   $this->_cb('"\n\n" . $me->_repl($me->repl[0], $m[1] . $me->encode_html($m[2], 1) . $m[3]) . "\n\n"'), $str);
+                                   function($m) use ($me) {
+                                     return "\n\n" . $me->_repl($me->repl[0], $m[1] . $me->encode_html($m[2], 1) . $m[3]) . "\n\n";
+                                   }, $str);
       // fix code tags within pre blocks we just saved.
       for ($i = $pre_start; $i < count($this->repl[0]); $i++) {
@@ -794 +805 @@
       // preserve code blocks by default, encode contents
       $str = preg_replace_callback('{(<code(?: [^>]+)?>)(.+?)(</code>)}s',
-                                   $this->_cb('$me->_repl($me->repl[0], $m[1] . $me->encode_html($m[2], 1) . $m[3])'), $str);
+                                   function($m) use ($me) {
+                                     return $me->_repl($me->repl[0], $m[1] . $me->encode_html($m[2], 1) . $m[3]);
+                                   }, $str);
 
       // encode blockcode tag (an XHTML 2 tag) and encode it's
       // content by default
       $str = preg_replace_callback('{(<blockcode(?: [^>]+)?>)(.+?)(</blockcode>)}s',
-                                   $this->_cb('"\n\n" . $me->_repl($me->repl[0], $m[1] . $me->encode_html($m[2], 1) . $m[3]) . "\n\n"'), $str);
+                                   function($m) use ($me) {
+                                     return "\n\n" . $me->_repl($me->repl[0], $m[1] . $me->encode_html($m[2], 1) . $m[3]) . "\n\n";
+                                   }, $str);
     }
 
     // LaTeX code
-    $str = preg_replace_callback('!((<tex>)(.*?)(<\/tex>))!s', $this->_cb('$me->_repl($me->repl[0], $me->format_latex(array("text" => $m[3])))'), $str);
+    $str = preg_replace_callback('!((<tex>)(.*?)(<\/tex>))!s',
+                                 function($m) use ($me) {
+                                   return $me->_repl($me->repl[0], $me->format_latex(array("text" => $m[3])));
+                                 }, $str);
 
     // pass through and remove links that follow this format
@@ -811 +829 @@
     //$links = array();
     $str = preg_replace_callback('{(?:\n|^) [ ]* \[ ([^ ]+?) [ ]*? (?:\( (.+?) \) )?  \] ((?:(?:ftp|https?|telnet|nntp)://|/)[^ ]+?) [ ]* (\n|$)}mx',
-                                 $this->_cb('($me->links[$m[1]] = array("url" => $m[3], "title" => $m[2])) ? $m[4] : $m[4]'), $str);
+                                 function($m) use ($me) {
+                                   return ($me->links[$m[1]] = array("url" => $m[3], "title" => $m[2])) ? $m[4] : $m[4];
+                                 }, $str);
     //$this->links = $links;
 
@@ -1032 +1052 @@
         //                                ==(.+?)==
         //                                (?:$|([\]}])|(?=' . $this->punct . '{1,2}|\s))}sx',
-        //                              $this->_cb('$me->_repl($me->repl[0], $me->format_block(array("text" => $m[2], "inline" => 1, "pre" => $m[1], "post" => $m[3])))'), $para);
+        //                              function($m) use ($me) {
+        //                                return $me->_repl($me->repl[0], $me->format_block(array("text" => $m[2], "inline" => 1, "pre" => $m[1], "post" => $m[3])));
+        //                              }, $para);
         $buffer .= $this->encode_html_basic($para, 1);
         $buffer = preg_replace('/&lt;textile#(\d+)&gt;/', '<textile#$1>', $buffer);
@@ -1209 +1231 @@
 
     array_unshift($this->repl, array());
+    $me =& $this;
     $buffer = preg_replace_callback('{(?:^|(?<=[\s>])|([{[]))
                                       ==(.+?)==
                                       (?:$|([\]}])|(?=' . $this->punct . '{1,2}|\s))}sx',
-                                    $this->_cb('$me->_repl($me->repl[0], $me->format_block(array("text" => $m[2], "inline" => 1, "pre" => $m[1], "post" => $m[3])))'), $buffer);
+                                    function($m) use ($me) {
+                                      return $me->_repl($me->repl[0], $me->format_block(array("text" => $m[2], "inline" => 1, "pre" => $m[1], "post" => $m[3])));
+                                    }, $buffer);
 
     unset($tokens);
@@ -1317 +1342 @@
     array_unshift($this->repl, array());
 
-    $text = preg_replace_callback('{' . $this->codere . '}mx', $this->_cb('$me->_repl($me->repl[0], $me->format_code(array("text" => $m[2] . $m[4], "lang" => $m[1] . $m[3])))'), $text);
+    $me =& $this;
+    $text = preg_replace_callback('{' . $this->codere . '}mx',
+                                  function($m) use ($me) {
+                                    return $me->_repl($me->repl[0], $me->format_code(array("text" => $m[2] . $m[4], "lang" => $m[1] . $m[3])));
+                                  }, $text);
 
     // images must be processed before encoding the text since they might
@@ -1334 +1363 @@
                                     (?::(\d+|' . $this->urlre . '))? # $7: optional URL
                                     (?:$|([\]}])|(?=' . $this->punct . '{1,2}|\s)) # $8: closing brace/bracket
-                                   }mx', $this->_cb('$me->_repl($me->repl[0], $me->format_image(array("pre" => $m[1], "src" => $m[5], "align" => ($m[2] ? $m[2] : $m[4]), "extra" => $m[6], "url" => $m[7], "clsty" => $m[3], "post" => $m[8])))'), $text);
+                                   }mx',
+                                  function($m) use ($me) {
+                                    return $me->_repl($me->repl[0], $me->format_image(array("pre" => $m[1], "src" => $m[5], "align" => ($m[2] ? $m[2] : $m[4]), "extra" => $m[6], "url" => $m[7], "clsty" => $m[3], "post" => $m[8])));
+                                  }, $text);
 
     $text = preg_replace_callback('{(?:^|(?<=[\s>])|([{[]))     # $1: open brace/bracket
@@ -1346 +1378 @@
                                     (?::(\d+|' . $this->urlre . '))? # $6: optional URL
                                     (?:$|([]}])|(?=' . $this->punct . '{1,2}|\s)) # $7: closing brace/bracket
-                                   }mx', $this->_cb('$me->_repl($me->repl[0], $me->format_span(array("pre" => $m[1], "text" => $m[5], "align" => ($m[2] ? $m[2] : $m[4]), "cite" => $m[6], "clsty" => $m[3], "post" => $m[7])))'), $text);
+                                   }mx',
+                                  function($m) use ($me) {
+                                    return $me->_repl($me->repl[0], $me->format_span(array("pre" => $m[1], "text" => $m[5], "align" => ($m[2] ? $m[2] : $m[4]), "cite" => $m[6], "clsty" => $m[3], "post" => $m[7])));
+                                  }, $text);
 
     $text = $this->encode_html($text);
@@ -1378 +1413 @@
                                     [\]}]
                                    )
-                                   }mx', $this->_cb('$me->_repl($me->repl[0], $me->format_link(array("text" => $m[1], "linktext" => $m[3] . $m[6], "title" => $me->encode_html_basic($m[4] . $m[7]), "url" => $m[8], "clsty" => $m[2] . $m[5])))'), $text);
+                                   }mx',
+                                  function($m) use ($me) {
+                                    return $me->_repl($me->repl[0], $me->format_link(array("text" => $m[1], "linktext" => $m[3] . $m[6], "title" => $me->encode_html_basic($m[4] . $m[7]), "url" => $m[8], "clsty" => $m[2] . $m[5])));
+                                  }, $text);
 
     $text = preg_replace_callback('{((?:^|(?<=[\s>\(]))                              # $1: open brace/bracket
@@ -1397 +1435 @@
                                     :(\d+|' . $this->urlre . ')                      # $8: URL suffix
                                     (?:$|(?=' . $this->punct . '{1,2}|\s)))          # $9: closing brace/bracket
-                                   }mx', $this->_cb('$me->_repl($me->repl[0], $me->format_link(array("text" => $m[1], "linktext" => $m[3] . $m[6], "title" => $me->encode_html_basic($m[4] . $m[7]), "url" => $m[8], "clsty" => $m[2] . $m[5])))'), $text);
+                                   }mx',
+                                  function($m) use ($me) {
+                                    return $me->_repl($me->repl[0], $me->format_link(array("text" => $m[1], "linktext" => $m[3] . $m[6], "title" => $me->encode_html_basic($m[4] . $m[7]), "url" => $m[8], "clsty" => $m[2] . $m[5])));
+                                  }, $text);
 
     if (preg_match('/^xhtml2/', $this->flavor())) {
@@ -1407 +1448 @@
                                       :(\d+|' . $this->urlre . ')                    # $3: optional citation URL
                                       (?:$|([\]}])|(?=' . $this->punct . '{1,2}|\s)) # $4: closing brace/bracket
-                                     }mx', $this->_cb('$me->_repl($me->repl[0], $me->format_cite(array("pre" => $m[1], "text" => $m[2], "cite" => $m[3], "post" => $m[4])))'), $text);
+                                     }mx',
+                                    function($m) use ($me) {
+                                      return $me->_repl($me->repl[0], $me->format_cite(array("pre" => $m[1], "text" => $m[2], "cite" => $m[3], "post" => $m[4])));
+                                    }, $text);
     }
 
@@ -1420 +1464 @@
     // translate macros:
     $text = preg_replace_callback('{(\{)(.+?)(\})}x',
-                                  $this->_cb('$me->format_macro(array("pre" => $m[1], "post" => $m[3], "macro" => $m[2]))'), $text);
+                                  function($m) use ($me) {
+                                    return $me->format_macro(array("pre" => $m[1], "post" => $m[3], "macro" => $m[2]));
+                                  }, $text);
 
     // these were present with textile 1 and are common enough
@@ -1450 +1496 @@
                                                       (?<=\S)' . $qf . '                             #
                                                       (?:$|([\]}])|(?=' . $this->punct . '{1,2}|\s)) # $4 - post
-                                                     }mx', $this->_cb('$me->format_tag(array("tag" => end($me->tmp["r"]), "marker" => end($me->tmp["f"]), "pre" => $m[1], "text" => $m[3], "clsty" => $m[2], "post" => $m[4]))'), $text))) {
+                                                     }mx',
+                                                    function($m) use ($me) {
+                                                      return $me->format_tag(array("tag" => end($me->tmp["r"]), "marker" => end($me->tmp["f"]), "pre" => $m[1], "text" => $m[3], "clsty" => $m[2], "post" => $m[4]));
+                                                    }, $text))) {
           $redo = ($redo || ($last != $text));
           $last = $text;
@@ -1463 +1512 @@
     // ABC(Aye Bee Cee) -> acronym
     $text = preg_replace_callback('{\b([A-Z][A-Za-z0-9]*?[A-Z0-9]+?)\b(?:[(]([^)]*)[)])}',
-                                  $this->_cb('$me->_repl($me->repl[0],"<acronym title=\"" . $me->encode_html_basic($m[2]) . "\">$m[1]</acronym>")'), $text);
+                                  function($m) use ($me) {
+                                    return $me->_repl($me->repl[0],"<acronym title=\"" . $me->encode_html_basic($m[2]) . "\">$m[1]</acronym>");
+                                  }, $text);
 
     // ABC -> 'capped' span
@@ -1470 +1521 @@
                                       ((?:[A-Z](?:[A-Z0-9\.,\']|\&amp;){2,}\ *)+?) # \'
                                       (?=[^A-Z\.0-9]|$)
-                                     /mx', $this->_cb('$m[1] . $me->_repl($me->repl[0], "<span class=\"" . end($me->tmp["caps"]) . "\">$m[2]</span>")'), $text);
+                                     /mx',
+                                    function($m) use ($me) {
+                                      return $m[1] . $me->_repl($me->repl[0], "<span class=\"" . end($me->tmp["caps"]) . "\">$m[2]</span>");
+                                    }, $text);
     }
     array_pop($this->tmp['caps']);
@@ -2102 +2156 @@
     $url = preg_replace('/&(?!amp;)/', '&amp;', $url);
     $url = preg_replace('/\ /', '+', $url);
-    $url = preg_replace_callback('/^((?:.+?)\?)(.+)$/', $this->_cb('$m[1] . $me->encode_url($m[2])'), $url);
+    $me =& $this;
+    $url = preg_replace_callback('/^((?:.+?)\?)(.+)$/',
+                                 function($m) use ($me) {
+                                   return $m[1] . $me->encode_url($m[2]);
+                                 }, $url);
     return $url;
   } // function format_url
@@ -2629 +2687 @@
    */
   function apply_filters($args) {
+    log_error("Filters are not supported in infoarena's fork of Textile.php " .
+              "because they use old-style anonymous functions.");
     $text = $args['text'];
     if (!$text) { return ''; }
@@ -2639 +2699 @@
       if (!isset($filters[$filter])) { continue; }
       if (is_string($filters[$filter])) {
-        $text = (($f = create_function_cached('$text, $param', $filters[$filter])) ? $f($text, $param) : $text);
+        $text = (($f = create_function('$text, $param', $filters[$filter])) ? $f($text, $param) : $text);
       }
     }
@@ -2769 +2829 @@
    */
   function encode_url($str) {
+    $me =& $this;
     $str = preg_replace_callback('!([^A-Za-z0-9_\.\-\+\&=%;])!x',
-                            $this->_cb('ord($m[1]) > 255 ? \'%u\' . sprintf("%04X", ord($m[1]))
-                                                       : \'%\'  . sprintf("%02X", ord($m[1]))'), $str);
+                                 function($m) use ($me) {
+                                   return ord($m[1]) > 255 ? '%u' . sprintf("%04X", ord($m[1])) : '%'  . sprintf("%02X", ord($m[1]));
+                                 }, $str);
     return $str;
   } // function encode_url
@@ -2786 +2848 @@
   function mail_encode($addr) {
     // granted, this is simple, but it gives off warm fuzzies
+    $me =& $this;
     $addr = preg_replace_callback('!([^\$])!x',
-                             $this->_cb('ord($m[1]) > 255 ? \'%u\' . sprintf("%04X", ord($m[1]))
-                                                        : \'%\'  . sprintf("%02X", ord($m[1]))'), $addr);
+                                  function($m) use ($me) {
+                                    return ord($m[1]) > 255 ? '%u' . sprintf("%04X", ord($m[1])) : '%'  . sprintf("%02X", ord($m[1]));
+                                  }, $addr);
     return $addr;
   } // function mail_encode
@@ -3241 +3305 @@
     return array("text" => "2.0.8", "build" => 2005032100);
   } // function version
-
-/**
-   * Creates a custom callback function from the provided PHP
-   * code. The result is used as the callback in
-   * @c preg_replace_callback calls. *JHR*
-   *
-   * @param $function A @c string specifying the PHP code for the
-   *        function body.
-   *
-   * @return A @c function to be used for the callback.
-   *
-   * @private
-   */
-  function _cb($function) {
-    $current =& Textile::_current_store($this);
-    return create_function_cached('$m',
-            '$me =& Textile::_current(); return '.$function .';');
-  } // function _cb
-
-  /**
-   * Stores a static variable for the Textile class. This helper
-   * function is used by @c _current to simulate a static
-   * class variable in PHP. *JHR*
-   *
-   * @param $new If a non-@c NULL object reference, the Textile object
-   *        to be set as the current object.
-   *
-   * @return The @c array containing a reference to the current
-   *         Textile object at index 0. An array is used because PHP
-   *         does not allow static variables to be references.
-   *
-   * @static
-   * @private
-   */
- /* static */ function &_current_store(&$new) {
-   static $current = array();
-
-   if ($new != NULL) {
-     $current = array(&$new);
-   }
-
-   return $current;
- } // function _current_store
-
-  /**
-   * Returns the "current" Textile object. This is used within
-   * anonymous callback functions which cannot have the scope of a
-   * specific object. *JHR*
-   *
-   * @return An @c object reference to the current Textile object.
-   *
-   * @static
-   * @private
-   */
- /* static */ function &_current() {
-   $current =& Textile::_current_store($null = NULL);
-   return $current[0];
- } // function _current
 } // class Textile
 
@@ -3464 +3470 @@
  * A pre-formatted block of text. Textile will not add any
  * HTML tags for individual lines. Whitespace is also preserved.
- * 
+ *
  * Note that within a "pre" block, \< and \> are
  * translated into HTML entities automatically.</li>
@@ -3474 +3480 @@
  * gets a \<code\> tag (or for XHTML 2, a \<blockcode\>
  * tag is used instead).
- * 
+ *
  * Note that within a "bc" block, \< and \> are
  * translated into HTML entities automatically.</li>