merge r10098,r10100,r10101,r10113,r10128,r10129 from trunk to branch 2.2

feature:2250
Incompatible plugins and obsolete plugins may not be activated.
Deactivate and uninstall obsolete plugins.
Add warning icon and tiptip
Add languages keys.
Add expire parameter.
Clean code.
Remove useless query for delete.

git-svn-id: http://piwigo.org/svn/branches/2.2@10131 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-04-07 09:47:01 +00:00
parent c01742afbd
commit 4408b67309
9 changed files with 204 additions and 39 deletions
-1
View File
@@ -157,7 +157,6 @@ else
define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
}
// language files
load_language('common.lang');
if ( is_admin() || (defined('IN_ADMIN') and IN_ADMIN) )