Fixed some stray undefined-variable problems revealed as a result of testing on Windows Server '03, IIS6, PHP/FastCGI, and PostgreSQL 8.2.5.
authorDan
Sat, 02 Feb 2008 22:32:09 -0500
changeset 396 3289e4dcb4b8
parent 395 fa4c5ecb7c9a
child 397 06415d243d09
Fixed some stray undefined-variable problems revealed as a result of testing on Windows Server '03, IIS6, PHP/FastCGI, and PostgreSQL 8.2.5.
includes/template.php
install/includes/stages/license.php
--- a/includes/template.php	Sat Feb 02 11:54:16 2008 -0500
+++ b/includes/template.php	Sat Feb 02 22:32:09 2008 -0500
@@ -841,7 +841,7 @@
   
   function footer($simple = false)
   {
-    echo $this->getFooter();
+    echo $this->getFooter($simple);
     ob_end_flush();
   }
   
@@ -852,7 +852,7 @@
       define('ENANO_HEADERS_SENT', '');
     if(!$this->no_headers) return $this->process_template('header.tpl');
   }
-  function getFooter()
+  function getFooter($simple = false)
   {
     global $db, $session, $paths, $template, $plugins; // Common objects
     global $lang;
--- a/install/includes/stages/license.php	Sat Feb 02 11:54:16 2008 -0500
+++ b/install/includes/stages/license.php	Sat Feb 02 22:32:09 2008 -0500
@@ -20,6 +20,7 @@
 function show_license($fb = false)
 {
   global $lang;
+  global $installer_version;
   ?>
   <div class="scroller">
   <?php
@@ -28,7 +29,7 @@
       echo 'Cannot find the license files.';
     }
     echo file_get_contents('./language/english/install/license-deed.html');
-    if ( defined('ENANO_BETA_VERSION') || $branch == 'unstable' )
+    if ( $installer_version['type'] != 'stable' )
     {
       ?>
       <h3><?php echo $lang->get('license_info_unstable_title'); ?></h3>
@@ -58,7 +59,7 @@
 {
   $wiki = & Text_Wiki::singleton('Mediawiki');
   $wiki->setRenderConf('Xhtml', 'code', 'css_filename', 'codefilename');
-  $wiki->setRenderConf('Xhtml', 'wikilink', 'view_url', contentPath);
+  $wiki->setRenderConf('Xhtml', 'wikilink', 'view_url', scriptPath . '/index.php?title=');
   $result = $wiki->transform($message, 'Xhtml');
   
   // HTML fixes