From 8ecfca5a9e0065362a887f60be320923a2f82ba2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Mar 2016 15:26:46 +0100
Subject: [PATCH] Revert change that break compatiblity with 100% of modules
---
dev/skeletons/skeleton_card.php | 2 +-
htdocs/comm/propal.php | 2 +-
htdocs/commande/card.php | 2 +-
htdocs/compta/facture.php | 2 +-
htdocs/compta/facture/fiche-rec.php | 2 +-
htdocs/contrat/card.php | 2 +-
htdocs/core/class/commonobject.class.php | 4 ++--
htdocs/core/class/html.form.class.php | 2 +-
htdocs/expedition/card.php | 2 +-
htdocs/expensereport/card.php | 2 +-
htdocs/fichinter/card.php | 2 +-
htdocs/fourn/commande/card.php | 2 +-
htdocs/fourn/facture/card.php | 2 +-
htdocs/livraison/card.php | 2 +-
htdocs/supplier_proposal/card.php | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index ac7e7169fd1..b122e9a86c7 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -322,7 +322,7 @@ if ($id && (empty($action) || $action == 'view' || $action == 'delete'))
// Example 2 : Adding links to objects
- //$somethingshown=Form::showLinkedObjectBlock($object);
+ //$somethingshown=$form->showLinkedObjectBlock($object);
//$linktoelem = $form->showLinkToObjectBlock($object);
//if ($linktoelem) print '<br>'.$linktoelem;
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 234eeaf149c..129a2f2dfbd 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2350,7 +2350,7 @@ if ($action == 'create')
$somethingshown = $formfile->show_documents('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 53625d0e5fd..43821645ac9 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2584,7 +2584,7 @@ if ($action == 'create' && $user->rights->commande->creer)
$somethingshown = $formfile->show_documents('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($object);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index e803ca51746..20abcd4c1af 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -4046,7 +4046,7 @@ else if ($id > 0 || ! empty($ref))
$somethingshown = $formfile->numoffiles;
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 9d1b88887b0..81844fbbaa9 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -983,7 +983,7 @@ else
print '<a name="builddoc"></a>'; // ancre
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
print '</div></div>';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3170a6b0b56..20171da0cd9 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2015,7 +2015,7 @@ else
$somethingshown = $formfile->show_documents('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d44230d3eb6..a65573a7947 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3115,13 +3115,13 @@ abstract class CommonObject
* Show linked object block.
*
* @return int <0 if KO, >0 if OK
- * @deprecated 3.8 Use instead Form::showLinkedObjectBlock($object)
+ * @deprecated 3.8 Use instead $form->showLinkedObjectBlock($object)
* @see Form::showLinkedObjectBlock
*/
function showLinkedObjectBlock()
{
global $form;
- return Form::showLinkedObjectBlock($this);
+ return $form->showLinkedObjectBlock($this);
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 667f76bf731..18862026461 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5063,7 +5063,7 @@ class Form
* @param CommonObject $object Object we want to show links to
* @return int <0 if KO, >0 if OK
*/
- function showLinkedObjectBlock($object)
+ function showLinkedObjectBlock(CommonObject $object)
{
global $conf,$langs,$hookmanager;
global $bc;
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c69a037613f..e1f4d49319e 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1802,7 +1802,7 @@ else if ($id || $ref)
$somethingshown=$formfile->show_documents('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($object);
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index e4a01267ab0..8660336a4cd 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2107,7 +2107,7 @@ if ($action != 'create' && $action != 'edit' && ($id || $ref))
$result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
}
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
$linktoelements=array();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 0e8f1810258..a45f3e90ef0 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1783,7 +1783,7 @@ else if ($id > 0 || ! empty($ref))
$somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($object);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8f59c743d18..326b0eba07e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2954,7 +2954,7 @@ elseif (! empty($object->id))
$somethingshown=$formfile->numoffiles;
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($object);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 0ce28c7e427..9c2e6699fed 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2371,7 +2371,7 @@ else
$somethingshown=$formfile->numoffiles;
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object,array('supplier_order'));
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 6383bdfd5e5..f3cc1084fa2 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -887,7 +887,7 @@ else
$shipment->fetch($object->origin_id);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($shipment);
+ $somethingshown = $form->showLinkedObjectBlock($shipment);
// Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($shipment);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 3dfa958dd3f..332d1c7a0d3 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1832,7 +1832,7 @@ if ($action == 'create')
$somethingshown = $formfile->show_documents('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
// Linked object block
- $somethingshown = Form::showLinkedObjectBlock($object);
+ $somethingshown = $form->showLinkedObjectBlock($object);
// Show links to link elements
//$linktoelem = $form->showLinkToObjectBlock($object);
--
GitLab