Changeset 1748 for trunk/include/functions.inc.php

Timestamp:

Jan 23, 2007, 11:03:06 PM (17 years ago)

Author:

rub

Message:

Undo r1677 functions_html.inc.php, because links are wrong.
I wanted to add flat_cat on categories url, but I will keep same comportment of the calendar.

Some improvements when updating #_config table

File:

• trunk/include/functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -3 +3 @@
 // | 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)
@@ -1008 +1008 @@
 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);
 }
@@ -1095 +1095 @@
  * @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');