aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-04-20 02:54:50 +0000
committerrvelices <rv-github@modusoptimus.com>2006-04-20 02:54:50 +0000
commitee37f7daf549cc55e06f77c2c7184570bbbfb0d7 (patch)
tree367743e3c228221a291bfbeea9a1c21f2b328aaf
parent9c47c507da96f65297d24ed53ee0ac0689c84aee (diff)
merge r1216 from branch-1_6 into trunk
bug 340: ini_set disabled to Club Internet ISP + 1 error text message fix: display issue with IE6 on admin rating (table from 100% to 99%) git-svn-id: http://piwigo.org/svn/trunk@1217 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_session.inc.php20
-rw-r--r--template/yoga/admin/rating.tpl2
2 files changed, 14 insertions, 8 deletions
diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index 5769a6c10..48271af6e 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -65,11 +65,17 @@ if (isset($conf['session_save_handler'])
'pwg_session_destroy',
'pwg_session_gc'
);
- ini_set('session.use_cookies', $conf['session_use_cookies']);
- ini_set('session.use_only_cookies', $conf['session_use_only_cookies']);
- ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
- ini_set('session.name', $conf['session_name']);
- ini_set('session.cookie_path', cookie_path() );
+ if ( function_exists('ini_set') )
+ {
+ ini_set('session.use_cookies', $conf['session_use_cookies']);
+ ini_set('session.use_only_cookies', $conf['session_use_only_cookies']);
+ ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
+ }
+ session_name( $conf['session_name'] );
+ session_set_cookie_params(
+ ini_get('session.cookie_lifetime'),
+ cookie_path()
+ );
}
// cookie_path returns the path to use for the PhpWebGallery cookie.
@@ -166,7 +172,7 @@ UPDATE '.SESSIONS_TABLE.'
;';
pwg_query($query);
if ( mysql_affected_rows()>0 )
- {
+ {
return true;
}
$query = '
@@ -174,7 +180,7 @@ INSERT INTO '.SESSIONS_TABLE.'
(id,data,expiration)
VALUES(\''.$session_id.'\',\''.$data.'\',now())
;';
- pwg_query($query);
+ mysql_query($query);
return true;
}
diff --git a/template/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
index 862e538e8..b955785f3 100644
--- a/template/yoga/admin/rating.tpl
+++ b/template/yoga/admin/rating.tpl
@@ -33,7 +33,7 @@
</form>
<div class="navigationBar">{NAVBAR}</div>
-<table width="100%">
+<table width="99%">
<tr class="throw">
<td>{lang:File}</td>
<td>{lang:Number of rates}</td>