adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 11:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Undo r1677 functions_html.inc.php, because links are wrong.

Browse Source 
I wanted to add flat_cat on categories url, but I will keep same comportment of the calendar.

Some improvements when updating #_config table


git-svn-id: http://piwigo.org/svn/trunk@1748 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-01-23 22:03:06 +00:00
parent 21e201f91b
commit e0ef6f5e07
4 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+6 -5
View File
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
// | file : $Id$
@@ -1007,7 +1007,7 @@ function l10n($key)
*/
function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
{
return sprintf(l10n(($decimal > 1 ? $plural_fmt_key :
return sprintf(l10n(($decimal > 1 ? $plural_fmt_key :
$singular_fmt_key)), $decimal);
}
@@ -1094,17 +1094,18 @@ function get_available_upgrade_ids()
*
* @return void
*/
function load_conf_from_db()
function load_conf_from_db($condition = '')
{
global $conf;
$query = '
SELECT param,value
SELECT param, value
FROM '.CONFIG_TABLE.'
'.(!empty($condition) ? 'WHERE '.$condition : '').'
;';
$result = pwg_query($query);
if (mysql_num_rows($result) == 0)
if ((mysql_num_rows($result) == 0) and !empty($condition))
{
die('No configuration data');
}