Skip to content
Snippets Groups Projects
Commit 68f290e9 authored by Prasad's avatar Prasad
Browse files

Fix for undefined variables usage - MR #877

parent d60e332d
No related branches found
No related tags found
No related merge requests found
...@@ -399,7 +399,7 @@ class PearDatabase{ ...@@ -399,7 +399,7 @@ class PearDatabase{
{ {
//if(dbType=="oci8") return 'empty_blob()'; //if(dbType=="oci8") return 'empty_blob()';
//else return 'null'; //else return 'null';
if (is_string) return 'null'; if ($is_string) return 'null';
return null; return null;
} }
...@@ -557,7 +557,7 @@ class PearDatabase{ ...@@ -557,7 +557,7 @@ class PearDatabase{
function sql_quote($data) { function sql_quote($data) {
if (is_array($data)) { if (is_array($data)) {
switch($data['type']) { switch($cur = $data['type']) {
case 'text': case 'text':
case 'numeric': case 'numeric':
case 'integer': case 'integer':
......
...@@ -518,6 +518,8 @@ function getListQuery($module, $where = '') { ...@@ -518,6 +518,8 @@ function getListQuery($module, $where = '') {
*/ */
function setSessionVar($lv_array, $noofrows, $max_ent, $module = '', $related = '') { function setSessionVar($lv_array, $noofrows, $max_ent, $module = '', $related = '') {
global $currentModule;
$start = ''; $start = '';
if ($noofrows >= 1) { if ($noofrows >= 1) {
$lv_array['start'] = 1; $lv_array['start'] = 1;
......
...@@ -136,7 +136,7 @@ abstract class AntlrLexer extends BaseRecognizer{ ...@@ -136,7 +136,7 @@ abstract class AntlrLexer extends BaseRecognizer{
} }
$i++; $i++;
$this->input->consume(); $this->input->consume();
$state->failed = false; $this->state->failed = false;
} }
} }
......
...@@ -1184,6 +1184,7 @@ class Vtiger_Field_Model extends Vtiger_Field { ...@@ -1184,6 +1184,7 @@ class Vtiger_Field_Model extends Vtiger_Field {
* @return <Array> * @return <Array>
*/ */
public function getCurrencyList() { public function getCurrencyList() {
$currencies = array();
$db = PearDatabase::getInstance(); $db = PearDatabase::getInstance();
// Not a good approach to get all the fields if not required(May leads to Performance issue) // Not a good approach to get all the fields if not required(May leads to Performance issue)
$result = $db->pquery('SELECT id, currency_name FROM vtiger_currency_info WHERE currency_status = ? AND deleted=0', array('Active')); $result = $db->pquery('SELECT id, currency_name FROM vtiger_currency_info WHERE currency_status = ? AND deleted=0', array('Active'));
...@@ -1398,6 +1399,7 @@ class Vtiger_Field_Model extends Vtiger_Field { ...@@ -1398,6 +1399,7 @@ class Vtiger_Field_Model extends Vtiger_Field {
foreach ($referenceList as $referenceModuleName) { foreach ($referenceList as $referenceModuleName) {
$autoFillData = $moduleModel->getAutoFillModuleAndField($referenceModuleName); $autoFillData = $moduleModel->getAutoFillModuleAndField($referenceModuleName);
if($autoFillData) { if($autoFillData) {
$newautoFillData = array();
foreach($autoFillData as $data) { foreach($autoFillData as $data) {
// To get the parent autofill reference field name of reference field // To get the parent autofill reference field name of reference field
$referenceModuleModel = Vtiger_Module_Model::getInstance($referenceModuleName); $referenceModuleModel = Vtiger_Module_Model::getInstance($referenceModuleName);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment