From 4408b67309e968eae8e7cbe5363566a261e3ee4a Mon Sep 17 00:00:00 2001 From: patdenice Date: Thu, 7 Apr 2011 09:47:01 +0000 Subject: 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 --- include/common.inc.php | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/common.inc.php b/include/common.inc.php index f5640f04c..048290e19 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -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) ) -- cgit v1.2.3