[Smarttemplate-cvscommit] smarttemplate class.smarttemplateparser.php, 1.9, 1.10
Brought to you by:
codeworxtech
|
From: EndelWar <end...@us...> - 2006-07-23 12:18:34
|
Update of /cvsroot/smarttemplate/smarttemplate In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20927 Modified Files: class.smarttemplateparser.php Log Message: Arrays keys in BEGIN..END can be unsorted and also non numeric Fixed bug #1526228 Index: class.smarttemplateparser.php =================================================================== RCS file: /cvsroot/smarttemplate/smarttemplate/class.smarttemplateparser.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** class.smarttemplateparser.php 2 Jul 2006 22:17:15 -0000 1.9 --- class.smarttemplateparser.php 23 Jul 2006 12:18:29 -0000 1.10 *************** *** 116,128 **** . "if (!is_array(\$$parent"."['$block']))\n" . "\$$parent"."['$block']=array(array('$block'=>\$$parent"."['$block']));\n" - . "\$_tmp_arr_keys=array_keys(\$$parent"."['$block']);\n" - . "if (\$_tmp_arr_keys[0]!='0')\n" - . "\$$parent"."['$block']=array(0=>\$$parent"."['$block']);\n" . "\$_stack[\$_stack_cnt++]=\$_obj;\n" . "foreach (\$$parent"."['$block'] as \$rowcnt=>\$$block) {\n" ! . "\$$block"."['ROWCNT']=\$rowcnt;\n" ! . "\$$block"."['ALTROW']=\$rowcnt%2;\n" ! . "\$$block"."['ROWBIT']=\$rowcnt%2;\n" ! . "\$_obj=&\$$block;\n?>"; $page = str_replace("<!-- BEGIN $tag -->", $code, $page); } --- 116,127 ---- . "if (!is_array(\$$parent"."['$block']))\n" . "\$$parent"."['$block']=array(array('$block'=>\$$parent"."['$block']));\n" . "\$_stack[\$_stack_cnt++]=\$_obj;\n" + . "\$rowcounter = 0;\n" . "foreach (\$$parent"."['$block'] as \$rowcnt=>\$$block) {\n" ! . "\$$block"."['ROWCNT']=(\$rowcounter+1);\n" ! . "\$$block"."['ALTROW']=\$rowcounter%2;\n" ! . "\$$block"."['ROWBIT']=\$rowcounter%2;\n" ! . "\$rowcounter++;" ! . "\$_obj=&\$$block;\n?>"; $page = str_replace("<!-- BEGIN $tag -->", $code, $page); } *************** *** 142,146 **** $cmp = '=='; } ! if (preg_match('/"([^"]*)"/',$val,$matches)) { --- 141,145 ---- $cmp = '=='; } ! if (preg_match('/"([^"]*)"/',$val,$matches)) { *************** *** 152,156 **** $code = "<?php\n$else"."if (\$$parent"."['$block'] $cmp \$$parent_right"."['$block_right']){\n?>"; } ! $page = str_replace($var[0][$cnt], $code, $page); } --- 151,155 ---- $code = "<?php\n$else"."if (\$$parent"."['$block'] $cmp \$$parent_right"."['$block_right']){\n?>"; } ! $page = str_replace($var[0][$cnt], $code, $page); } |