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

Merge pull request #9443 from frederic34/patch-10

Browse Source 
Completely comment unused code
This commit is contained in:
Laurent Destailleur 2018-09-12 17:28:29 +02:00 committed by GitHub
commit bdcbc71ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
htdocs/accountancy/class/accountancycategory.class.php
View File

@ -195,18 +195,18 @@ class AccountancyCategory // extends CommonObject
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_accounting_category"); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_accounting_category");
if (! $notrigger) // Uncomment this and change MYOBJECT to your own tag if you
{ // want this action call a trigger.
// Uncomment this and change MYOBJECT to your own tag if you //if (! $notrigger)
// want this action call a trigger. //{
//// Call triggers // // Call triggers
//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; // include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
//$interface=new Interfaces($this->db); // $interface=new Interfaces($this->db);
//$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf); // $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
//if ($result < 0) { $error++; $this->errors=$interface->errors; } // if ($result < 0) { $error++; $this->errors=$interface->errors; }
//// End call triggers // // End call triggers
} //}
} }
// Commit or rollback // Commit or rollback
@ -334,18 +334,17 @@ class AccountancyCategory // extends CommonObject
if (! $error) if (! $error)
{ {
if (! $notrigger) // Uncomment this and change MYOBJECT to your own tag if you
{ // want this action call a trigger.
// Uncomment this and change MYOBJECT to your own tag if you //if (! $notrigger)
// want this action call a trigger. //{
// // Call triggers
//// Call triggers // include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; // $interface=new Interfaces($this->db);
//$interface=new Interfaces($this->db); // $result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
//$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); // if ($result < 0) { $error++; $this->errors=$interface->errors; }
//if ($result < 0) { $error++; $this->errors=$interface->errors; } // // End call triggers
//// End call triggers //}
}
} }
// Commit or rollback // Commit or rollback
@ -390,18 +389,17 @@ class AccountancyCategory // extends CommonObject
if (! $error) if (! $error)
{ {
if (! $notrigger) // Uncomment this and change MYOBJECT to your own tag if you
{ // want this action call a trigger.
// Uncomment this and change MYOBJECT to your own tag if you //if (! $notrigger)
// want this action call a trigger. //{
// // Call triggers
//// Call triggers // include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; // $interface=new Interfaces($this->db);
//$interface=new Interfaces($this->db); // $result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); // if ($result < 0) { $error++; $this->errors=$interface->errors; }
//if ($result < 0) { $error++; $this->errors=$interface->errors; } // // End call triggers
//// End call triggers //}
}
} }
// Commit or rollback // Commit or rollback

9
htdocs/core/lib/website.lib.php
View File

@ -567,8 +567,9 @@ function dolSavePageAlias($filealias, $object, $objectpage)
$aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n"; $aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
$aliascontent.= '?>'."\n"; $aliascontent.= '?>'."\n";
$result = file_put_contents($filealias, $aliascontent); $result = file_put_contents($filealias, $aliascontent);
if (! empty($conf->global->MAIN_UMASK)) if (! empty($conf->global->MAIN_UMASK)) {
@chmod($filealias, octdec($conf->global->MAIN_UMASK)); @chmod($filealias, octdec($conf->global->MAIN_UMASK));
}
return ($result?true:false); return ($result?true:false);
} }
@ -646,7 +647,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
* @param string $pathofwebsite Path of website root * @param string $pathofwebsite Path of website root
* @param string $fileindex Full path of file index.php * @param string $fileindex Full path of file index.php
* @param string $filetpl File tpl to index.php page redirect to * @param string $filetpl File tpl to index.php page redirect to
* @param string $fileindex Full path of file wrapper.php * @param string $filewrapper Full path of file wrapper.php
* @return boolean True if OK * @return boolean True if OK
*/ */
function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper) function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
@ -826,5 +827,3 @@ function dolSaveHtaccessFile($filehtaccess, $htaccess)
return true; return true;
} }