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
This commit is contained in:
rvelices
2009-02-13 13:02:20 +00:00
parent bd8b4f51bb
commit b77b4f0aba
9 changed files with 151 additions and 201 deletions
-1
View File
@@ -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),
);
// +-----------------------------------------------------------------------+