diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_default.inc.php | 6 | ||||
| -rw-r--r-- | include/constants.php | 1 | ||||
| -rw-r--r-- | include/functions_user.inc.php | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 700fd68a5..e13090fd4 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -269,4 +269,10 @@ $conf['allow_random_representative'] = false; // allow_html_descriptions : authorize administrators to use HTML in // category and element description. $conf['allow_html_descriptions'] = true; + +// gallery_title : Title for RSS feed +$conf['gallery_title'] = 'PhpWebGallery demo'; + +// galery_url : URL given in RSS feed +$conf['gallery_url'] = 'http://demo.phpwebgallery.net'; ?> diff --git a/include/constants.php b/include/constants.php index 258583305..a04020d50 100644 --- a/include/constants.php +++ b/include/constants.php @@ -52,6 +52,7 @@ define('USER_ACCESS_TABLE', $prefixeTable.'user_access'); define('USER_GROUP_TABLE', $prefixeTable.'user_group'); define('USERS_TABLE', $conf['users_table']); define('USER_INFOS_TABLE', $prefixeTable.'user_infos'); +define('USER_FEED_TABLE', $prefixeTable.'user_feed'); define('WAITING_TABLE', $prefixeTable.'waiting'); define('IMAGE_METADATA_TABLE', $prefixeTable.'image_metadata'); define('RATE_TABLE', $prefixeTable.'rate'); diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 492d9a6fc..b669a61bc 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -429,8 +429,8 @@ function find_available_feed_id() $key = generate_key(50); $query = ' SELECT COUNT(*) - FROM '.USER_INFOS_TABLE.' - WHERE feed_id = \''.$key.'\' + FROM '.USER_FEED_TABLE.' + WHERE id = \''.$key.'\' ;'; list($count) = mysql_fetch_row(pwg_query($query)); if (0 == $count) @@ -460,7 +460,6 @@ function create_user_infos($user_id) 'nb_line_page' => $conf['nb_line_page'], 'language' => $conf['default_language'], 'recent_period' => $conf['recent_period'], - 'feed_id' => find_available_feed_id(), 'expand' => boolean_to_string($conf['auto_expand']), 'show_nb_comments' => boolean_to_string($conf['show_nb_comments']), 'maxwidth' => $conf['default_maxwidth'], |