# HG changeset patch
# User Dan
# Date 1259638514 18000
# Node ID c522ea3871a30476d1bfb2ca5cb0a2eb9a668208
# Parent  5a858d6f3634620bd211fdea7815a5a0f7d50874# Parent  5d988bd8fa468bb99884609fdf62ff8005cc36d6
Merge from accidental split

diff -r 5a858d6f3634 -r c522ea3871a3 includes/wikiengine/parse_mediawiki.php
--- a/includes/wikiengine/parse_mediawiki.php	Mon Nov 30 22:34:58 2009 -0500
+++ b/includes/wikiengine/parse_mediawiki.php	Mon Nov 30 22:35:14 2009 -0500
@@ -182,10 +182,17 @@
     
     // Wrap all block level tags
     RenderMan::tag_strip('_paragraph_bypass', $text, $_nw);
+    
     // I'm not sure why I had to go through all these alternatives. Trying to bring it
     // all down to one by ?'ing subpatterns was causing things to return empty and throwing
     // errors in the parser. Eventually, around ~3:57AM I just settled on this motherf---er
     // of a regular expression.
+    
+    // FIXME: This regexp triggers a known PHP stack size issue under win32 and possibly
+    // other platforms (<http://bugs.php.net/bug.php?id=47689>). The workaround is going to
+    // involve writing our own parser that takes care of recursion without using the stack,
+    // which is going to be a bitch, and may not make it in until Caoineag RCs.
+    
     $regex = ";
               <($blocklevel)
               (?:
@@ -206,13 +213,6 @@
               )
                 ;sx";
                 
-    // using preg_replace here sometimes gives us empty strings probably because we're using $0
-    // in the replace formatter. so we'll just take care of it explicitly here with preg_match_all
-    // and good ole str_replace_once.
-    
-    // FIXME this regexp can cause crashes under win32 PHP due to some apache limitations... possibly
-    // write a non-regexp based replacement. same bug as the comment block above, apparently
-    
     // oh. and we're using this tokens thing because for identical matches, the first match will
     // get wrapped X number of times instead of all matches getting wrapped once; replacing each
     // with a unique token id remedies this
diff -r 5a858d6f3634 -r c522ea3871a3 language/english/core.json
--- a/language/english/core.json	Mon Nov 30 22:34:58 2009 -0500
+++ b/language/english/core.json	Mon Nov 30 22:35:14 2009 -0500
@@ -40,7 +40,7 @@
       tz: 'Time zones',
       plural: 's',
       enano_about_th: 'About the Enano Content Management System',
-      enano_about_poweredby: '<p>This website is powered by <a href="http://enanocms.org/">Enano</a>, the lightweight and open source CMS that everyone can use. Enano is copyright &copy; 2006-2009 Dan Fuhry. For legal information, along with a list of libraries that Enano uses, please see <a href="http://enanocms.org/Legal_information">Legal Information</a>.</p><p>The developers and maintainers of Enano strongly believe that software should not only be free to use, but free to be modified, distributed, and used to create derivative works. For more information about Free Software, check out the <a href="http://en.wikipedia.org/wiki/Free_Software" onclick="window.open(this.href); return false;">Wikipedia page</a> or the <a href="http://www.fsf.org/" onclick="window.open(this.href); return false;">Free Software Foundation\'s</a> homepage.</p>',
+      enano_about_poweredby: '<p>This website is powered by <a href="http://enanocms.org/">Enano</a>, the lightweight and open source CMS that everyone can use. Enano is copyright &copy; 2006-2009 Dan Fuhry. For legal information, along with a list of libraries that Enano uses, please see <a href="http://enanocms.org/Legal_information">Legal Information</a>.</p><p>The developers and maintainers of Enano strongly believe that software should not only be free to use, but free to be modified, distributed, and used to create derivative works. To help achieve this goal, we use licensing terms that require you to pass on the freedoms we give you when you share Enano. For more information about Free Software, check out the <a href="http://en.wikipedia.org/wiki/Free_Software" onclick="window.open(this.href); return false;">Wikipedia page</a> or the <a href="http://www.fsf.org/" onclick="window.open(this.href); return false;">Free Software Foundation\'s</a> homepage.</p>',
       enano_about_gpl: '<p>This program is Free Software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</p><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.</p><p>You should have received <a href="%gpl_link%">a copy of the GNU General Public License</a> along with this program; if not, write to:</p><p style="margin-left 2em;">Free Software Foundation, Inc.,<br />51 Franklin Street, Fifth Floor<br />Boston, MA 02110-1301, USA</p><p>Alternatively, you can <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">read it online</a>.</p>',
       enano_about_lbl_enanoversion: '<a href="http://enanocms.org">Enano</a> version:',
       enano_about_lbl_webserver: 'Web server:',
diff -r 5a858d6f3634 -r c522ea3871a3 plugins/SpecialPageFuncs.php
--- a/plugins/SpecialPageFuncs.php	Mon Nov 30 22:34:58 2009 -0500
+++ b/plugins/SpecialPageFuncs.php	Mon Nov 30 22:35:14 2009 -0500
@@ -410,7 +410,8 @@
         </p>
         <p>
           The developers and maintainers of Enano strongly believe that software should not only be free to use, but free to be modified,
-          distributed, and used to create derivative works. For more information about Free Software, check out the
+          distributed, and used to create derivative works. To help achieve this goal, we use licensing terms that require you to pass on
+          the freedoms we give you when you share Enano. For more information about Free Software, check out the
           <a href="http://en.wikipedia.org/wiki/Free_Software" onclick="window.open(this.href); return false;">Wikipedia page</a> or
           the <a href="http://www.fsf.org/" onclick="window.open(this.href); return false;">Free Software Foundation's</a> homepage.
         </p>