Changeset 6256

Timestamp:

May 20, 2010, 9:14:36 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

Merged from trunk to branch 2.15

Location:

extensions/NBC_UserAdvManager/branches/2.15

Files:

• changelog.txt.php (modified) (1 diff)
• include/upgradedb.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/branches/2.15/changelog.txt.php

@@ -173 +173 @@
             Some translations revisited
             Bug 1655 fixed - Navigation bar is usefull again
+            
+-- 2.15.3 : Quick update to fix a database upgrade issue 
 */
 ?>

extensions/NBC_UserAdvManager/branches/2.15/include/upgradedb.inc.php

@@ -9 +9 @@
  */
 
-if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+if(!defined('UAM_PATH'))
+{
+  define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+}
 if (!defined('UAM_ROOT'))
 {

extensions/NBC_UserAdvManager/branches/2.15/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.15.2
+Version: 2.15.3
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216

extensions/NBC_UserAdvManager/branches/2.15/maintain.inc.php

@@ -1 +1 @@
 <?php
 
-if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+if(!defined('UAM_PATH'))
+{
+  define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+}
 if (!defined('UAM_ROOT'))
 {
@@ -159 +162 @@
 /* Check if old version is > 2.15 */
 /* ****************************** */
-   $query = '
+// In preparation of next releases
+/*   $query = '
 SELECT param
   FROM '.CONFIG_TABLE.'
-WHERE param LIKE \"UserAdvManager%\"
+WHERE param LIKE "UserAdvManager%"
 ;';
   $count = pwg_db_num_rows(pwg_query($query));
@@ -170 +174 @@
     upgrade_2151_2152();
   }
-
+*/
 load_conf_from_db('param like \'UserAdvManager\\_%\'');
 }