merge -c2829 from trunk to branch 2.0

The exact copy of commit log in 2829.

git-svn-id: http://piwigo.org/svn/branches/2.0@2830 68402e56-0260-453c-a942-63ccdbb3a9ee

6 files changed, 15 insertions, 46 deletions

diff --git a/plugins/c13y_upgrade/initialize.inc.php b/plugins/c13y_upgrade/initialize.inc.php
index 4926da638..29cb11f13 100644
--- a/plugins/c13y_upgrade/initialize.inc.php
+++ b/plugins/c13y_upgrade/initialize.inc.php
@@ -34,7 +34,7 @@ function c13y_upgrade($c13y)
 

   load_language('plugin.lang', dirname(__FILE__).'/');

 

-  $can_be_deactivate = true;

+  $to_deactivate = true;

 

   /* Check user with same e-mail */

   $query = '

@@ -52,7 +52,7 @@ limit 0,1
 

   if (mysql_fetch_array(pwg_query($query)))

   {

-    $can_be_deactivate = false;

+    $to_deactivate = false;

     $c13y->add_anomaly(

       l10n('c13y_dbl_email_user'),

       null,

@@ -82,7 +82,7 @@ where
   $result = pwg_query($query);

   while ($row = mysql_fetch_assoc($result))

   {

-    $can_be_deactivate = false;

+    $to_deactivate = false;

 

     $uninstall_msg_link =

       '<a href="'.

@@ -98,45 +98,19 @@ where
       $uninstall_msg_link);

   }

 

-  /* Check if this plugin must deactivate */

-  if ($can_be_deactivate)

+  /* Check if this plugin must be deactivate */

+  if ($to_deactivate)

   {

-    $deactivate_msg_link =

-      '<a href="'.

-      PHPWG_ROOT_PATH.

-      'admin.php?page=plugins_list&amp;plugin=c13y_upgrade&amp;action=deactivate'.

-      '" onclick="window.open(this.href, \'\'); return false;">'.

-      l10n('c13y_upgrade_deactivate').'</a>';

-

-    $c13y->add_anomaly(

-      l10n('c13y_upgrade_no_anomaly'),

-      'c13y_upgrade_correction',

-      'deactivate_plugin',

-      $deactivate_msg_link

-      );

-  }

-}

-

-function c13y_upgrade_correction($action)

-{

-  $result = false;

-

-  switch ($action)

-  {

-    case 'deactivate_plugin':

-      {

-        $query = '

+    $query = '

 REPLACE INTO '.PLUGINS_TABLE.'

 (id, state)

 VALUES (\'c13y_upgrade\', \'inactive\')

 ;';

-        pwg_query($query);

-        $result = true;

-      }

-      break;

-  }

+    pwg_query($query);

 

-  return $result;

+  global $page;

+  $page['infos'][] = l10n('c13y_upgrade_no_anomaly');

+  }

 }

 

 ?>

diff --git a/plugins/c13y_upgrade/language/de_DE/plugin.lang.php b/plugins/c13y_upgrade/language/de_DE/plugin.lang.php
index c2e35f13f..36dd642aa 100644
--- a/plugins/c13y_upgrade/language/de_DE/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/de_DE/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Keine Unregelmäßigkeiten festgestellt nach der Aktualisierung der Anwendung';
-$lang['c13y_upgrade_deactivate'] = 'Sie können desactivate "Check-Upgrades"-Plugin';
+$lang['c13y_upgrade_no_anomaly'] = 'Keine Unregelmäßigkeiten festgestellt nach der Aktualisierung der Anwendung'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Benutzer mit gleichen E-Mail-Adresse';
 $lang['c13y_correction_dbl_email_user'] = 'Löschen doppeltes Benutzer';
 $lang['c13y_obsolete_plugin'] = 'Veraltete Plugin';
diff --git a/plugins/c13y_upgrade/language/en_UK/plugin.lang.php b/plugins/c13y_upgrade/language/en_UK/plugin.lang.php
index b4fd37004..114272e12 100644
--- a/plugins/c13y_upgrade/language/en_UK/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/en_UK/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade';
-$lang['c13y_upgrade_deactivate'] = 'You can deactivate "Check upgrades" plugin';
+$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade, "Check upgrades" plugin was deactivated.';
 $lang['c13y_dbl_email_user'] = 'Users with same email address';
 $lang['c13y_correction_dbl_email_user'] = 'Delete duplicate users';
 $lang['c13y_obsolete_plugin'] = 'Obsolete plugin';
diff --git a/plugins/c13y_upgrade/language/es_ES/plugin.lang.php b/plugins/c13y_upgrade/language/es_ES/plugin.lang.php
index 226e33bd1..1cec68d8c 100644
--- a/plugins/c13y_upgrade/language/es_ES/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/es_ES/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación';
-$lang['c13y_upgrade_deactivate'] = 'Usted puede desactivar el plugin Check upgrades';
+$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Utilizadores con la misma dirección e-mail';
 $lang['c13y_correction_dbl_email_user'] = 'Suprima a los utilizadores en duplicado';
 $lang['c13y_obsolete_plugin'] = 'Plugin obsoleto';
diff --git a/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php b/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php
index bd903f213..758cda9ca 100644
--- a/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application';
-$lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"';
+$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application, le plugin "Check upgrades" a été désactivé.';
 $lang['c13y_dbl_email_user'] = 'Utilisateurs avec la même adresse email';
 $lang['c13y_correction_dbl_email_user'] = 'Supprimez les utilisateurs en double';
 $lang['c13y_obsolete_plugin'] = 'Plugin obsolète';
diff --git a/plugins/c13y_upgrade/language/it_IT/plugin.lang.php b/plugins/c13y_upgrade/language/it_IT/plugin.lang.php
index 8c2bd75b4..c4a2a9aeb 100644
--- a/plugins/c13y_upgrade/language/it_IT/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/it_IT/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Nessun\' anomalia individuata dopo l\'aggiornamento dell\'applicatione';
-$lang['c13y_upgrade_deactivate'] = 'Potete disattivare il plugin "Check upgrades"';
+$lang['c13y_upgrade_no_anomaly'] = 'Nessun\' anomalia individuata dopo l\'aggiornamento dell\'applicatione'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Utenti con lo stesso indirizzo email';
 $lang['c13y_correction_dbl_email_user'] = 'Cancellare i doppioni';
 $lang['c13y_obsolete_plugin'] = 'Plugin obsoleto';