# HG changeset patch
# User Dan
# Date 1265666683 18000
# Node ID d8c6b8d49604dafd2cf91dee63b653bb0f1d143b
# Parent  fbfd6c852c89e4a4e6b828d2b2361963d91cf5fc# Parent  25af9c98a7dc9221fff115b6c22e3e2834899f05
Merged braches from accidental split

diff -r 25af9c98a7dc -r d8c6b8d49604 includes/functions.php
--- a/includes/functions.php	Wed Feb 03 02:35:47 2010 -0500
+++ b/includes/functions.php	Mon Feb 08 17:04:43 2010 -0500
@@ -2739,7 +2739,7 @@
     return $page_id;
   }
 
-  preg_match_all('/\.[A-Fa-f0-9][A-Fa-f0-9]/', $page_id, $matches);
+  preg_match_all('/\.[a-f0-9][a-f0-9]/', $page_id, $matches);
 
   foreach ( $matches[0] as $id => $char )
   {
diff -r 25af9c98a7dc -r d8c6b8d49604 includes/template.php
--- a/includes/template.php	Wed Feb 03 02:35:47 2010 -0500
+++ b/includes/template.php	Mon Feb 08 17:04:43 2010 -0500
@@ -581,7 +581,7 @@
       // point to jsres compressor
       $js_head .= <<<JSEOF
       <!-- Only load a basic set of functions for now. Let the rest of the API load when the page is finished. -->
-      <script type="text/javascript" src="$cdnpath/includes/clientside/jsres.php?early&$enano_version"></script>
+      <script type="text/javascript" src="$cdnpath/includes/clientside/jsres.php?early&amp;$enano_version"></script>
 JSEOF;
       $js_foot = '';
       
@@ -596,10 +596,10 @@
         {
           // special case for l10n: also load strings
           global $lang;
-          $js_foot .= "\n    <script type=\"text/javascript\" src=\"" . makeUrlNS("Special", "LangExportJSON/$lang->lang_id", $enano_version) . "\"></script>";
+          $js_foot .= "\n    <script type=\"text/javascript\" src=\"" . makeUrlNS("Special", "LangExportJSON/$lang->lang_id", $enano_version, true) . "\"></script>";
         }
         $scripts = implode(',', $this->js_preload);
-        $js_foot .= "\n    <script type=\"text/javascript\" src=\"" . cdnPath . "/includes/clientside/jsres.php?f=$scripts&$enano_version\"></script>";
+        $js_foot .= "\n    <script type=\"text/javascript\" src=\"" . cdnPath . "/includes/clientside/jsres.php?f=$scripts&amp;$enano_version\"></script>";
         
       }