diff options
| author | rvelices <rv-github@modusoptimus.com> | 2009-02-13 13:02:20 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2009-02-13 13:02:20 +0000 |
| commit | b77b4f0aba107444ad5003d4c6e9b72cb348a6ca (patch) | |
| tree | 02ffed73dbc2c052da0df1e8f9f69efa119a7f44 /include/config_default.inc.php | |
| parent | bd8b4f51bb68178ea48db2cd55b1ea3a15c63c45 (diff) | |
merge r3136 from trunk
- moved check upgrade feed code to admin/include/functions_upgrade.php
- refactored some code (shorter and somehow faster - but nothing revolutionary)
- decrease lost space in permalinks.tpl and hard coded column width (was illisible)
git-svn-id: http://piwigo.org/svn/branches/2.0@3137 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/config_default.inc.php')
| -rw-r--r-- | include/config_default.inc.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php index c0f889808..81fe7ef0f 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -688,7 +688,6 @@ $conf['filter_pages'] = array 'install' => array('cancel' => true), 'password' => array('cancel' => true), 'register' => array('cancel' => true), - 'upgrade_feed' => array('cancel' => true), ); // +-----------------------------------------------------------------------+ |