From 2d185bf1490a275543d8fffeb98718654554a1a2 Mon Sep 17 00:00:00 2001
From: chrisaga <chrisaga@piwigo.org>
Date: Fri, 14 Apr 2006 18:22:19 +0000
Subject: [PATCH] - merge trunc r1167:1168 into branch 1.6

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1169 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/functions_session.inc.php |  2 +-
 template/yoga/admin.tpl           | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index f2533d1d1..482c76376 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -165,7 +165,7 @@ UPDATE '.SESSIONS_TABLE.'
   WHERE id = \''.$session_id.'\'
 ;';
   pwg_query($query);
-  if ( mysql_affected_rows()==-1 )
+  if ( mysql_affected_rows()==0 )
   {
     $query = '
 INSERT INTO '.SESSIONS_TABLE.'
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 6f0a58789..24177e427 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -1,5 +1,4 @@
 <!-- $Id$ -->
-
 <div id="menubar">
   <dl>
     <dt>{lang:links}</dt>
@@ -9,7 +8,8 @@
         <li><a href="{U_ADMIN}" title="{L_ADMIN_HINT}">{L_ADMIN}</a></li>
       </ul>
     </dd>
-
+  </dl>
+  <dl>
     <dt>{lang:general}</dt>
     <dd>
       <ul>
@@ -21,7 +21,8 @@
 	<li><a href="{U_NOTIFICATION_BY_MAIL}">{lang:nbm_item_notification}</a></li>
       </ul>
     </dd>
-
+  </dl>
+  <dl>
     <dt>{lang:config}</dt>
     <dd>
       <ul>
@@ -30,7 +31,8 @@
 	<li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
       </ul>
     </dd>
-
+  </dl>
+  <dl>
     <dt>{lang:Categories}</dt>
     <dd>
       <ul>
@@ -45,7 +47,8 @@
 	<!-- END representative -->
       </ul>
     </dd>
-
+  </dl>
+  <dl>
     <dt>{lang:pictures}</dt>
     <dd>
       <ul>
@@ -57,7 +60,8 @@
 	<li><a href="{U_TAGS}">{lang:Tags}</a></li>
       </ul>
     </dd>
-
+  </dl>
+  <dl>
     <dt>{lang:identification}</dt>
     <dd>
       <ul>