lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Avoid errors into rpm packages

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-31 23:45:11 +00:00
parent 58165f2973
commit fe374dec9a
5 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/contrat/fiche.php
View File

@ -23,7 +23,7 @@
* \file htdocs/contrat/fiche.php
* \ingroup contrat
* \brief Page of a contract
* \version $Id: fiche.php,v 1.198 2011/08/02 12:44:20 simnandez Exp $
* \version $Id: fiche.php,v 1.197 2011/07/31 23:46:54 eldy Exp $
*/
require ("../main.inc.php");
@ -757,7 +757,7 @@ else
$var=!$var;
if ($_REQUEST["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
if ($action != 'editline' || $_GET["rowid"] != $objp->rowid)
{
print '<tr '.$bc[$var].' valign="top">';
// Libelle
@ -1286,5 +1286,5 @@ else
$db->close();
llxFooter('$Date: 2011/08/02 12:44:20 $ - $Revision: 1.198 $');
llxFooter('$Date: 2011/07/31 23:46:54 $ - $Revision: 1.197 $');
?>

5
htdocs/core/class/conf.class.php
View File

@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@ -25,7 +24,7 @@
* \ingroup core
* \brief File of class to manage storage of current setup
* Config is stored into file conf.php
* \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $
* \version $Id: conf.class.php,v 1.63 2011/07/31 23:45:13 eldy Exp $
*/

5
htdocs/core/class/cookie.class.php
View File

@ -12,14 +12,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/core/class/cookie.class.php
* \ingroup core
* \version $Id: cookie.class.php,v 1.6 2011/07/30 08:56:26 eldy Exp $
* \version $Id: cookie.class.php,v 1.7 2011/07/31 23:45:13 eldy Exp $
* \brief File of class to manage cookies
*/

7
htdocs/core/class/translate.class.php
View File

@ -23,7 +23,7 @@
* \brief File for Tanslate class
* \author Eric Seigne
* \author Laurent Destailleur
* \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $
* \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $
*/
@ -512,10 +512,9 @@ class Translate {
* Return list of all available languages
* @param langdir Directory to scan
* @param maxlength Max length for each value in combo box (will be truncated)
* @param usecode Show code instead of country name for language variant
* @return array List of languages
*/
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0)
{
global $conf;
@ -528,7 +527,7 @@ class Translate {
{
$this->load("languages");
if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE)
{
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
}

7
htdocs/imports/import.php
View File

@ -13,15 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/imports/import.php
* \ingroup import
* \brief Pages of import Wizard
* \version $Id: import.php,v 1.68 2011/07/29 22:31:37 eldy Exp $
* \version $Id: import.php,v 1.69 2011/07/31 23:46:39 eldy Exp $
*/
require_once("../main.inc.php");
@ -1669,7 +1668,7 @@ print '<br>';
$db->close();
llxFooter('$Date: 2011/07/29 22:31:37 $ - $Revision: 1.68 $');
llxFooter('$Date: 2011/07/31 23:46:39 $ - $Revision: 1.69 $');
/*