- 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
This commit is contained in:
chrisaga
2006-04-14 18:22:19 +00:00
parent fce33ca7ec
commit 2d185bf149
2 changed files with 11 additions and 7 deletions
+1 -1
View File
@@ -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.'
+10 -6
View File
@@ -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>