diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-05-28 19:58:51 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-05-28 19:58:51 +0000 |
| commit | 722c4a3a9740506ed4f409fcd9517027f8cbcee5 (patch) | |
| tree | f2df91637c418d6aacf07a4059fbe0a8923167cf /install/upgrade_1.5.0.php | |
| parent | ef50e468d4f7115e6e9ee7b54165230c8831109f (diff) | |
merge r6368,6410 from branch-2.1 to trunk
- merged the linkroot integration with the existing gallery_url (unique $conf['gallery_url'] used for RSS, mail homepage root in the browse path)
- added an option $conf['debug_mail'] - if set all outgoing mails are saved into local_data_dir
git-svn-id: http://piwigo.org/svn/trunk@6411 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | install/upgrade_1.5.0.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php index 910198803..0efeed877 100644 --- a/install/upgrade_1.5.0.php +++ b/install/upgrade_1.5.0.php @@ -318,8 +318,8 @@ foreach ($queries as $query) // $params = array( 'gallery_url' => array( - 'http://piwigo.org/demo', - 'URL given in RSS feed' + '', + 'Optional alternate homepage for the gallery' ), 'rate' => array( 'true', |