Merged r3298 to r3302 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3303 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 7c30482f1db864ebd5de1bf3d61a6f49cc737285..f01ee8e1f7ceaf68bc759bf26dda95640ba4d295 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -62,7 +62,7 @@
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
        
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2009 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2010 Jean-Philippe Lang
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7b7c6f090fae7e3e89c67f8db2660b312f2e75a3..0a439b806e1659ceedda9f6fd30877ea9449d4ec 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,13 @@ Redmine - project management software
 Copyright (C) 2006-2010  Jean-Philippe Lang
 http://www.redmine.org/
 
+== 0.9.1
+
+* Vertical alignment for inline images in formatted text set to 'middle'
+* Fixed: Redmine.pm error "closing dbh with active statement handles at /usr/lib/perl5/Apache/Redmine.pm"
+* Fixed: copyright year in footer set to 2010
+
+
 == 2010-01-09 v0.9.0 (Release candidate)
 
 * Unlimited subproject nesting

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 1829d2b0b4990a5881de1d59f793567a7858ff69..1b3b0910f8fa05be5d73c362253507cc4521f886 100644 (file)
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -244,7 +244,9 @@ sub is_public_project {
        }
     }
     $sth->finish();
+    undef $sth;
     $dbh->disconnect();
+    undef $dbh;
 
     $ret;
 }
@@ -310,10 +312,13 @@ sub is_member {
             $ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass));
           }
           $sthldap->finish();
+          undef $sthldap;
       }
   }
   $sth->finish();
+  undef $sth;
   $dbh->disconnect();
+  undef $dbh;
 
   if ($cfg->{RedmineCacheCredsMax} and $ret) {
     if (defined $usrprojpass) {

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3b951486fe79ebd67af43d22174c835997506fe1..b8fe94678b32bae8095e71a206efa13175970a6c 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -674,6 +674,8 @@ a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
 a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
 h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
 
+div.wiki img { vertical-align: middle; } 
+
 /***** My page layout *****/
 .block-receiver {
 border:1px dashed #c0c0c0;