Fixes for #6224 , #631 and #638

shimondoodkin · Sep 2, 2010 · 2aac0ee · 2aac0ee
1 parent 0288c5c
commit 2aac0ee
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/gtd_constants.inc.php b/gtd_constants.inc.php
@@ -1,5 +1,5 @@
 <?php
-define('_GTD_REVISION',615);
+define('_GTD_REVISION',616);
 define('_GTD_VERSION','0.8z.09'); // DATABASE version
 define('_GTDPHP_VERSION','0.9beta');  // gtd-php version, as per the TRAC system
 

diff --git a/gtdfuncs.inc.php b/gtdfuncs.inc.php
@@ -183,12 +183,19 @@ function makeclean($textIn,$stripSlashes=false) {
         $cleaned=array();
         foreach ($textIn as $line) $cleaned[]=makeclean($line);
     } else {
+		  if ($stripSlashes) $textin = stripslashes($textIn);
+		  if ( version_compare( PHP_VERSION,'5.2.3',  '>=' ) ) {
+			 // htmlentities doubleEncode (4th param) needs PHP 5.2.3 or higher
+        $cleaned=htmlentities( $textIn, ENT_QUOTES,
+													$_SESSION['config']['charset'], FALSE ); 
+			} else {
         $cleaned=htmlentities(
-          ($stripSlashes) ? stripslashes($textIn) : $textIn,
-          ENT_QUOTES,
-                    $_SESSION['config']['charset'],
-                    FALSE );
-    }
+					html_entity_decode($textIn, ENT_QUOTES,$_SESSION['config']['charset']),
+					ENT_QUOTES,
+					$_SESSION['config']['charset'] ); 
+		  }
+		}
+
     return $cleaned;
 }
 //-------------------------------------------------

diff --git a/gtdfuncs.js b/gtdfuncs.js
@@ -908,6 +908,12 @@ GTD.ParentSelector.prototype.gotparent=function gtd_ps_gp(id,title,type,typename
       attr( { href: "itemReport.php?itemId="+id, title: "view parent" } ) ) ).
     append( $( "<td>" ).text( typename ).append( input ) ).
     appendTo( $("#parentlist") );
+
+  $("#parenttable").
+    after( $("<p>").
+    addClass( "warning" ).
+    text( "changes are not yet saved" ) ).
+    next(".warning").next(".warning").remove();
 };
 // -------------------------------------------------------------------------
 GTD.ParentSelector.prototype.makeline=function gtd_ps_ml(id,title,type,typename,i,useTypes,onetype) {

diff --git a/listItems.inc.php b/listItems.inc.php
@@ -110,7 +110,7 @@
 */
 // default list of fields
 $dispArray=array(
-    'parent'=>'parents'
+    'parent'=>'Parents'
     ,'type'=>'type'
     ,'flags'=>'!'
     ,'NA'=>'NA'

diff --git a/processItems.php b/processItems.php
@@ -569,7 +569,7 @@ function nextPage() { // set up the forwarding to the next page
             break;
 
         default        :
-            $nextURL=$tst;
+            $nextURL = (is_array($tst)) ? $tst[0] : $tst;
             break;
     }
     log_value('referrer',$updateGlobals['referrer']);