From c04812cd15d2bc7c66bfd1bef8a6c0866f28ba0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Ferry?= Date: Sat, 15 Mar 2014 21:24:37 +0100 Subject: [PATCH] Fix: bad lang file --- htdocs/core/modules/modResource.class.php | 4 ++-- htdocs/resource/class/actions_resource.class.php | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 75f565a8bea..d5fbefd719b 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -73,7 +73,7 @@ class modResource extends DolibarrModules // use this->picto='pictovalue' // If file is in module/img directory under name object_pictovalue.png // use this->picto='pictovalue@module' - $this->picto = 'resource@resource'; // mypicto@resource + $this->picto = 'resource'; // mypicto@resource // Defined all module parts (triggers, login, substitutions, menus, css, etc...) // for default path (eg: /resource/core/xxxxx) (0=disable, 1=enable) // for specific path of parts (eg: /resource/core/modules/barcode) @@ -116,7 +116,7 @@ class modResource extends DolibarrModules $this->phpmin = array(5, 3); // Minimum version of Dolibarr required by module $this->need_dolibarr_version = array(3, 5); - $this->langfiles = array("resource@resource"); // langfiles@resource + $this->langfiles = array("resource"); // langfiles@resource // Constants // List of particular constants to add when module is enabled // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive) diff --git a/htdocs/resource/class/actions_resource.class.php b/htdocs/resource/class/actions_resource.class.php index 7185ce07192..2daa45f8475 100644 --- a/htdocs/resource/class/actions_resource.class.php +++ b/htdocs/resource/class/actions_resource.class.php @@ -23,7 +23,6 @@ /** * Actions class file for resources * - * \class ActionsResource */ class ActionsResource { @@ -47,13 +46,13 @@ class ActionsResource * * @param array $parameters parameters * @param object &$object object - * @param string &$action action + * @param string &$action action * @return void */ function doActions($parameters, &$object, &$action) { global $langs,$user; - $langs->load('resource@resource'); + $langs->load('resource'); if (in_array('element_resource',explode(':',$parameters['context']))) {