Changeset 9037 for extensions/user_tags/include

Timestamp:

Feb 1, 2011, 2:11:29 PM (13 years ago)

Author:

nikrou

Message:

Fix translation issue
Fix bugs with special configuration params :

• $confquestion_mark_in_urls = false;
• $confphp_extension_in_urls = false;

Prepare piwigo release 2.2 (func_combine_script instead of func_known_script)

Location:

extensions/user_tags/include

Files:

• t4u_admin_action.inc.php (modified) (2 diffs)
• t4u_config.class.php (modified) (2 diffs)
• t4u_content.class.php (modified) (2 diffs)

extensions/user_tags/include/t4u_admin_action.inc.php

@@ -3 +3 @@
 // | User Tags  - a plugin for Piwigo                                      |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2010 Nicolas Roudaire             http://www.nikrou.net  |
+// | Copyright(C) 2010-2011 Nicolas Roudaire        http://www.nikrou.net  |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -36 +36 @@
   if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
     header("Content-Type: application/json");
-    $message['info'] = l10n('Tags updated');
+    $message['info'] = 'Tags updated';
 
     echo json_encode($message);

extensions/user_tags/include/t4u_config.class.php

@@ -3 +3 @@
 // | User Tags  - a plugin for Piwigo                                      |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2010 Nicolas Roudaire             http://www.nikrou.net  |
+// | Copyright(C) 2010-2011 Nicolas Roudaire        http://www.nikrou.net  |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -100 +100 @@
   
   public function getActionUrl($base_url, $action) {
+    global $conf;
+
     $url = $base_url;
-    $url .= '&action='.$action;           
+    if ($conf['question_mark_in_urls']) {
+      $url .= '&';
+    } else {
+      $url .= '?';      
+    }
+    $url .= 'action='.$action;           
 
     return $url;

extensions/user_tags/include/t4u_content.class.php

@@ -3 +3 @@
 // | User Tags  - a plugin for Piwigo                                      |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2010 Nicolas Roudaire             http://www.nikrou.net  |
+// | Copyright(C) 2010-2011 Nicolas Roudaire        http://www.nikrou.net  |
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -33 +33 @@
     }
 
-    $template->func_known_script(array('id' => 'jquery',
-                                       'src' => get_root_url().'themes/default/js/jquery.packed.js'
-                                       ),
-                                 $template->smarty
-                                 );
+    load_language('plugin.lang', T4U_PLUGIN_LANG);
+
+    if (version_compare(PHPWG_VERSION, '2.2', '>=') || (PHPWG_VERSION=='Colibri')) {
+      $template->func_combine_script(array('id' => 'jquery',
+                                           'path' => 'themes/default/js/jquery.min.js'
+                                           ),
+                                     $template->smarty
+                                     );
+    } else {
+      $template->func_known_script(array('id' => 'jquery',
+                                         'src' => get_root_url().'themes/default/js/jquery.packed.js'
+                                         ),
+                                   $template->smarty
+                                   );
+    }
 
     $template->assign('T4U_JS', T4U_JS);