Merge lp:~charles-wisniewski/sahana-agasti/0.6.4 into lp:sahana-agasti/krakatoa

[charles wisniewski]

this should fix bug #353573.

[chamindra (chamindra)]

The pass by reference was probably implemented for a reason. It modified the $conf directly. Does this impact the functions that use that reference? And what is the alternative that has been implemented to resolve it? A return with the new values?

review: Needs Information

[charles wisniewski (charles-wisniewski)]

Ah, hello...

The only difference is that it is now explicitly handled this way (i.e.
you do not have to manually specify &$variable, you can just pass
$variable to pass by reference) those were the only changes made and code
still executes just as should, though does not provide warnings now. it
was in response to tim/fran's want to show/use sahana-agasti as a proof of
concept

Charles Wisniewski
Application Architect
CUNY School of Professional Studies
tel: [phone]
http://sps.cuny.edu/

chamindra <email address hidden>
Sent by: <email address hidden>
05/30/2010 09:05 AM
Please respond to
<email address hidden>

To
<email address hidden>
cc

Subject
Re: [Merge] lp:~charles-wisniewski/sahana-agasti/0.6.4 into
lp:sahana-agasti/0.6

Review: Needs Information
The pass by reference was probably implemented for a reason. It modified
the $conf directly. Does this impact the functions that use that
reference? And what is the alternative that has been implemented to
resolve it? A return with the new values?
--
https://code.launchpad.net/~charles-wisniewski/sahana-agasti/0.6.4/+merge/26250

You are the owner of lp:~charles-wisniewski/sahana-agasti/0.6.4.

[chamindra (chamindra)]

OK thanks for the clarification. I approve for merge.

review: Approve

=== modified file 'sahana-phase2/inc/lib_config.inc'
--- sahana-phase2/inc/lib_config.inc	2006-12-06 17:23:20 +0000
+++ sahana-phase2/inc/lib_config.inc	2010-05-27 21:39:28 +0000
@@ -26,10 +26,10 @@
         // database overrides conf files
         shn_config_base_conf_fetch();
         shn_config_module_conf_fetch('all');
-        shn_config_database_fetch(&$conf,'all');
+        shn_config_database_fetch($conf,'all');
     } else {
         // conf files overrides database
-        shn_config_database_fetch(&$conf,'all');
+        shn_config_database_fetch($conf,'all');
         shn_config_base_conf_fetch();
         shn_config_module_conf_fetch('all');
     }

=== modified file 'sahana-phase2/inc/lib_location.inc'
--- sahana-phase2/inc/lib_location.inc	2010-01-04 06:47:14 +0000
+++ sahana-phase2/inc/lib_location.inc	2010-05-27 21:39:28 +0000
@@ -110,7 +110,7 @@
 	global $global;
 	$db=$global["db"];
 	$loc_arr=array();
-   	shn_get_parents($loc,&$loc_arr);
+   	shn_get_parents($loc,$loc_arr);
    	if ($loc_arr[0]=='unknown') {
    		shn_form_label(_("Organization Location"),"Unknown");
    	} else {
@@ -213,7 +213,7 @@
  * @access public
  * @return array
  */
-function shn_get_parents($child,&$loc_arr)
+function shn_get_parents($child,$loc_arr)
 {
 	global $global;
 	include_once $global['approot']."/inc/lib_validate.inc";

=== modified file 'sahana-phase2/mod/admin/conf_admin.inc'
--- sahana-phase2/mod/admin/conf_admin.inc	2008-05-15 15:25:07 +0000
+++ sahana-phase2/mod/admin/conf_admin.inc	2010-05-27 21:39:28 +0000
@@ -125,7 +125,7 @@
 </script>
 		<?php
 		ksort($conf);
-		shn_config_database_fetch(&$dconf,'all');
+		shn_config_database_fetch($dconf,'all');
 		?>
 <div id="result">
 <table>

=== modified file 'sahana-phase2/mod/cr/camp.inc'
--- sahana-phase2/mod/cr/camp.inc	2008-07-23 07:09:39 +0000
+++ sahana-phase2/mod/cr/camp.inc	2010-05-27 21:39:28 +0000
@@ -788,7 +788,7 @@
 	$db=$global["db"];
 	$loc_arr=array();
 	include $global['approot']."/inc/lib_location.inc";
-   	shn_get_parents($loc,&$loc_arr);
+   	shn_get_parents($loc,$loc_arr);
    	if($loc_arr[0]=='unknown'){
    		//shn_form_label(_("Organization Location"),"Unknown");
    	}else{

=== modified file 'sahana-phase2/mod/cr/edit.inc'
--- sahana-phase2/mod/cr/edit.inc	2008-07-25 06:31:07 +0000
+++ sahana-phase2/mod/cr/edit.inc	2010-05-27 21:39:28 +0000
@@ -697,7 +697,7 @@
 	global $global;
 	$db=$global["db"];
 	$loc_arr=array();
-   	shn_get_parents($loc,&$loc_arr);
+   	shn_get_parents($loc,$loc_arr);
    	if($loc_arr[0]=='unknown'){
    		//shn_form_label(_("Organization Location"),"Unknown");
    	}else{
@@ -718,4 +718,4 @@
    	}
    	return $location;
 }
-?>
\ No newline at end of file
+?>

=== modified file 'sahana-phase2/mod/cr/reports.inc'
--- sahana-phase2/mod/cr/reports.inc	2007-12-18 10:16:03 +0000
+++ sahana-phase2/mod/cr/reports.inc	2010-05-27 21:39:28 +0000
@@ -333,7 +333,7 @@
 	$db=$global["db"];
 	$loc_arr=array();
 	include_once $global['approot']."/inc/lib_location.inc";
-   	shn_get_parents($loc,&$loc_arr);
+   	shn_get_parents($loc,$loc_arr);
         if($loc=="-1")
             return _('Unspecified Location');
    	if($loc_arr[0]=='unknown'){

=== modified file 'sahana-phase2/mod/ims/lib_ims.inc'
--- sahana-phase2/mod/ims/lib_ims.inc	2009-12-22 11:42:28 +0000
+++ sahana-phase2/mod/ims/lib_ims.inc	2010-05-27 21:39:28 +0000
@@ -1980,7 +1980,7 @@
 	global $global;
 	$db=$global["db"];
 	$loc_arr=array();
-   	shn_get_parents($loc,&$loc_arr);
+   	shn_get_parents($loc,$loc_arr);
    	if($loc_arr[0]=='unknown'){
    		shn_form_label(_("Organization Location"),"Unknown");
    	}else{

=== modified file 'sahana-phase2/mod/or/lib_or.inc'
--- sahana-phase2/mod/or/lib_or.inc	2010-01-06 08:23:55 +0000
+++ sahana-phase2/mod/or/lib_or.inc	2010-05-27 21:39:28 +0000
@@ -33,7 +33,7 @@
     if($loc!=-1){
 		$search_str.=",location_details";
 		$loc_arr=array($loc);
-		$loc_arr=shn_location_get_descendants($loc,&$loc_arr);
+		$loc_arr=shn_location_get_descendants($loc,$loc_arr);
 		$loc_str=shn_or_create_database_IN_array($loc_arr);
     }
     $search_str.=" where 1=1 ";
@@ -138,7 +138,7 @@
 	global $global;
 	$db=$global["db"];
 	$loc_arr=array();
-   	shn_get_parents($loc,&$loc_arr);
+   	shn_get_parents($loc,$loc_arr);
    	if($loc_arr[0]=='unknown'){
    		shn_form_label(_("Organization Location"),"Unknown");
    	}else{