# HG changeset patch
# User Dan
# Date 1219381542 14400
# Node ID 04f8250583e55886f1dab5c1bfb1af9d1e2df27c
# Parent  fc42bccc65e50bb48bb58ca13ef0f572eb0b1c39# Parent  4c2d4833a96823d20cdb1ab1e0c8f7d40867ce43
Forgot to update, merging heads from nighthawk and scribus

diff -r fc42bccc65e5 -r 04f8250583e5 .hgtags
diff -r fc42bccc65e5 -r 04f8250583e5 includes/clientside/static/dropdown.js
--- a/includes/clientside/static/dropdown.js	Fri Aug 22 01:04:20 2008 -0400
+++ b/includes/clientside/static/dropdown.js	Fri Aug 22 01:05:42 2008 -0400
@@ -140,7 +140,7 @@
   }
   if(obj.nextSibling.tagName.toLowerCase() == 'ul' || ( obj.nextSibling.tagName.toLowerCase() == 'div' && obj.nextSibling.className == 'submenu' ))
   {
-    $(a).addClass('liteselected');
+    $(obj).addClass('liteselected');
     //obj.className = 'liteselected';
     var ul = obj.nextSibling;
     var dim = fetch_dimensions(obj);
diff -r fc42bccc65e5 -r 04f8250583e5 includes/pageprocess.php
--- a/includes/pageprocess.php	Fri Aug 22 01:04:20 2008 -0400
+++ b/includes/pageprocess.php	Fri Aug 22 01:05:42 2008 -0400
@@ -1303,23 +1303,25 @@
     $this->header();
     $this->do_breadcrumbs();
     
+    $standard_404 = '';
+    
     if ( $userpage )
     {
-      echo '<h3>There is no page with this title yet.</h3>
+      $standard_404 .= '<h3>There is no page with this title yet.</h3>
              <p>This user has not created his or her user page yet.';
     }
     else
     {
-      echo '<h3>There is no page with this title yet.</h3>
+      $standard_404 .= '<h3>There is no page with this title yet.</h3>
              <p>You have requested a page that doesn\'t exist yet.';
     }
     if ( $session->get_permissions('create_page') )
     {
-      echo ' You can <a href="'.makeUrlNS($this->namespace, $this->page_id, 'do=edit', true).'" onclick="ajaxEditor(); return false;">create this page</a>, or return to the <a href="'.makeUrl(getConfig('main_page')).'">homepage</a>.';
+      $standard_404 .= ' You can <a href="'.makeUrlNS($this->namespace, $this->page_id, 'do=edit', true).'" onclick="ajaxEditor(); return false;">create this page</a>, or return to the <a href="'.makeUrl(getConfig('main_page')).'">homepage</a>.';
     }
     else
     {
-      echo ' Return to the <a href="'.makeUrl(getConfig('main_page')).'">homepage</a>.</p>';
+      $standard_404 .= ' Return to the <a href="'.makeUrl(getConfig('main_page')).'">homepage</a>.</p>';
     }
     if ( $session->get_permissions('history_rollback') )
     {
@@ -1331,17 +1333,27 @@
       if ( $db->numrows() > 0 )
       {
         $r = $db->fetchrow();
-        echo '<p><b>This page was deleted on ' . $r['date_string'] . '.</b> The stated reason was:</p><blockquote>' . $r['edit_summary'] . '</blockquote><p>You can probably <a href="'.makeUrl($paths->page, 'do=rollback&amp;id='.$r['time_id']).'" onclick="ajaxRollback(\''.$r['time_id'].'\'); return false;">roll back</a> the deletion.</p>';
+        $standard_404 .= '<p><b>This page was deleted on ' . $r['date_string'] . '.</b> The stated reason was:</p><blockquote>' . $r['edit_summary'] . '</blockquote><p>You can probably <a href="'.makeUrl($paths->page, 'do=rollback&amp;id='.$r['time_id']).'" onclick="ajaxRollback(\''.$r['time_id'].'\'); return false;">roll back</a> the deletion.</p>';
         if ( $session->user_level >= USER_LEVEL_ADMIN )
         {
-          echo '<p>Additional admin options: <a href="' . makeUrl($paths->page, 'do=detag', true) . '" title="Remove any tags on this page">detag page</a></p>';
+          $standard_404 .= '<p>Additional admin options: <a href="' . makeUrl($paths->page, 'do=detag', true) . '" title="Remove any tags on this page">detag page</a></p>';
         }
       }
       $db->free_result();
     }
-    echo '<p>
+    $standard_404 .= '<p>
             HTTP Error: 404 Not Found
           </p>';
+          
+    $msg = ( $pp = $paths->sysmsg('Page_not_found') ) ? RenderMan::render($pp) : '{STANDARD404}';
+    $parser = $template->makeParserText($msg);
+    $parser->assign_vars(array(
+        'STANDARD404' => $standard_404
+      ));
+    
+    $msg = $parser->run();
+    eval( '?>' . $msg );
+    
     $this->footer();
   }
   
diff -r fc42bccc65e5 -r 04f8250583e5 includes/rijndael.php
--- a/includes/rijndael.php	Fri Aug 22 01:04:20 2008 -0400
+++ b/includes/rijndael.php	Fri Aug 22 01:05:42 2008 -0400
@@ -900,10 +900,10 @@
     {
       $key .= chr(mt_rand(0, 255));
     }
-    if ( @file_exists('/dev/random') && @is_readable('/dev/random') )
+    if ( @file_exists('/dev/urandom') && @is_readable('/dev/urandom') )
     {
       // Let's use something a little more secure
-      $ur = @fopen('/dev/random', 'r');
+      $ur = @fopen('/dev/urandom', 'r');
       if ( !$ur )
         return $key;
       $ukey = @fread($ur, $len);
diff -r fc42bccc65e5 -r 04f8250583e5 includes/wikiformat.php
--- a/includes/wikiformat.php	Fri Aug 22 01:04:20 2008 -0400
+++ b/includes/wikiformat.php	Fri Aug 22 01:05:42 2008 -0400
@@ -154,7 +154,7 @@
         
         chdir($d);
 
-        $obj =& new $class($rules);
+        $obj = new $class($rules);
         return $obj;
     }
 
@@ -514,7 +514,7 @@
             }
         }
 
-        $this->parseObj[$rule] =& new $class($this);
+        $this->parseObj[$rule] = new $class($this);
 
     }
 
@@ -536,7 +536,7 @@
             }
         }
 
-        $this->renderObj[$rule] =& new $class($this);
+        $this->renderObj[$rule] = new $class($this);
     }
 
     function loadFormatObj($format)
@@ -556,7 +556,7 @@
             }
         }
 
-        $this->formatObj[$format] =& new $class($this);
+        $this->formatObj[$format] = new $class($this);
     }
 
     function addPath($type, $dir)
diff -r fc42bccc65e5 -r 04f8250583e5 upgrade.sql
--- a/upgrade.sql	Fri Aug 22 01:04:20 2008 -0400
+++ b/upgrade.sql	Fri Aug 22 01:05:42 2008 -0400
@@ -5,7 +5,7 @@
 DELETE FROM {{TABLE_PREFIX}}config WHERE config_name='enano_version' OR config_name='enano_beta_version' OR config_name='enano_alpha_version' OR config_name='enano_rc_version';
 INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.5' );
 ---BEGIN 1.0.4---
-ALTER TABLE {{TABLE_PREFIX}}tags CHANGE user user_id mediumint(8) NOT NULL DEFAULT 1;
+@ALTER TABLE {{TABLE_PREFIX}}tags CHANGE user user_id mediumint(8) NOT NULL DEFAULT 1;
 ---END 1.0.4---
 ---BEGIN 1.0.3---
 -- No DB changes in this release