@@ -118,11 +118,11 @@ |
||
118 | 118 | * preserve whitespace as well. Therefore we split on words, |
119 | 119 | * but include all blocks of whitespace in the wordlist. */ |
120 | 120 | $diff = new Text_Diff($this->_splitOnWords($text1, $nl), |
121 | - $this->_splitOnWords($text2, $nl)); |
|
121 | + $this->_splitOnWords($text2, $nl)); |
|
122 | 122 | |
123 | 123 | /* Get the diff in inline format. */ |
124 | 124 | $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(), |
125 | - array('split_level' => 'words'))); |
|
125 | + array('split_level' => 'words'))); |
|
126 | 126 | |
127 | 127 | /* Run the diff and get the output. */ |
128 | 128 | return str_replace($nl, "\n", $renderer->render($diff)) . "\n"; |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | $block[] = new Text_Diff_Op_copy($context); |
90 | 90 | } |
91 | 91 | $output .= $this->_block($x0, $ntrail + $xi - $x0, |
92 | - $y0, $ntrail + $yi - $y0, |
|
93 | - $block); |
|
92 | + $y0, $ntrail + $yi - $y0, |
|
93 | + $block); |
|
94 | 94 | $block = false; |
95 | 95 | } |
96 | 96 | } |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | |
119 | 119 | if (is_array($block)) { |
120 | 120 | $output .= $this->_block($x0, $xi - $x0, |
121 | - $y0, $yi - $y0, |
|
122 | - $block); |
|
121 | + $y0, $yi - $y0, |
|
122 | + $block); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | return $output . $this->_endDiff(); |
@@ -156,5 +156,4 @@ |
||
156 | 156 | <br /> |
157 | 157 | \n" ; |
158 | 158 | |
159 | - return $form; |
|
160 | -} |
|
159 | + return $form |
|
161 | 160 | \ No newline at end of file |
@@ -156,5 +156,4 @@ |
||
156 | 156 | <br /> |
157 | 157 | \n" ; |
158 | 158 | |
159 | - return $form; |
|
160 | -} |
|
159 | + return $form |
|
161 | 160 | \ No newline at end of file |
@@ -1085,8 +1085,4 @@ |
||
1085 | 1085 | // the first form (blocks) |
1086 | 1086 | $this->list_blocks() ; |
1087 | 1087 | // the second form (groups) |
1088 | - $this->list_groups() ; |
|
1089 | - break ; |
|
1090 | - } |
|
1091 | - } |
|
1092 | -} |
|
1088 | + $this->list_groups |
|
1093 | 1089 | \ No newline at end of file |
@@ -1085,8 +1085,4 @@ |
||
1085 | 1085 | // the first form (blocks) |
1086 | 1086 | $this->list_blocks() ; |
1087 | 1087 | // the second form (groups) |
1088 | - $this->list_groups() ; |
|
1089 | - break ; |
|
1090 | - } |
|
1091 | - } |
|
1092 | -} |
|
1088 | + $this->list_groups |
|
1093 | 1089 | \ No newline at end of file |
@@ -160,7 +160,4 @@ |
||
160 | 160 | $module_id = (int)(@$regs[0]); |
161 | 161 | $page_id = (int)(@$regs[1]); |
162 | 162 | $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ; |
163 | - $this->db->query($sql) ; |
|
164 | - } |
|
165 | -} |
|
166 | -} |
|
163 | + $this->db->query($sql |
|
167 | 164 | \ No newline at end of file |
@@ -160,7 +160,4 @@ |
||
160 | 160 | $module_id = (int)(@$regs[0]); |
161 | 161 | $page_id = (int)(@$regs[1]); |
162 | 162 | $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ; |
163 | - $this->db->query($sql) ; |
|
164 | - } |
|
165 | -} |
|
166 | -} |
|
163 | + $this->db->query($sql |
|
167 | 164 | \ No newline at end of file |
@@ -268,4 +268,4 @@ |
||
268 | 268 | $xoopsTpl->assign('xoops_showcblock', 0); |
269 | 269 | } |
270 | 270 | |
271 | - $xoopsTpl->xoops_setCaching(0); |
|
271 | + $xoopsTpl->xoops_setCaching |
|
272 | 272 | \ No newline at end of file |
@@ -268,4 +268,4 @@ |
||
268 | 268 | $xoopsTpl->assign('xoops_showcblock', 0); |
269 | 269 | } |
270 | 270 | |
271 | - $xoopsTpl->xoops_setCaching(0); |
|
271 | + $xoopsTpl->xoops_setCaching |
|
272 | 272 | \ No newline at end of file |
@@ -49,9 +49,4 @@ |
||
49 | 49 | >>>>>>> feature/intval |
50 | 50 | if ($count <= 0) { |
51 | 51 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
52 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
53 | - } |
|
54 | - } |
|
55 | - } |
|
56 | - } |
|
57 | -} |
|
52 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
58 | 53 | \ No newline at end of file |
@@ -49,9 +49,4 @@ |
||
49 | 49 | >>>>>>> feature/intval |
50 | 50 | if ($count <= 0) { |
51 | 51 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
52 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
53 | - } |
|
54 | - } |
|
55 | - } |
|
56 | - } |
|
57 | -} |
|
52 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
58 | 53 | \ No newline at end of file |
@@ -20,8 +20,4 @@ |
||
20 | 20 | >>>>>>> feature/intval |
21 | 21 | if ($count <= 0) { |
22 | 22 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
23 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
24 | - } |
|
25 | - } |
|
26 | - } |
|
27 | -} |
|
23 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
28 | 24 | \ No newline at end of file |
@@ -20,8 +20,4 @@ |
||
20 | 20 | >>>>>>> feature/intval |
21 | 21 | if ($count <= 0) { |
22 | 22 | include_once XOOPS_TRUST_PATH.'/libs/altsys/include/tpls_functions.php' ; |
23 | - tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime) ; |
|
24 | - } |
|
25 | - } |
|
26 | - } |
|
27 | -} |
|
23 | + tplsadmin_import_data($xoopsConfig['template_set'], $file, implode('', file($file_path)), $mtime |
|
28 | 24 | \ No newline at end of file |
@@ -398,14 +398,4 @@ |
||
398 | 398 | <select name='copy_to[{$tplset4disp}]'> |
399 | 399 | ".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)." |
400 | 400 | </select> |
401 | - <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' /> |
|
402 | - </td>\n" ; |
|
403 | - } |
|
404 | - |
|
405 | -echo " </tr>\n" ; |
|
406 | - |
|
407 | - |
|
408 | -echo '</table></form>'; |
|
409 | -// end of table & form |
|
410 | - |
|
411 | -xoops_cp_footer() ; |
|
401 | + <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp} |
|
412 | 402 | \ No newline at end of file |
@@ -398,14 +398,4 @@ |
||
398 | 398 | <select name='copy_to[{$tplset4disp}]'> |
399 | 399 | ".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)." |
400 | 400 | </select> |
401 | - <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' /> |
|
402 | - </td>\n" ; |
|
403 | - } |
|
404 | - |
|
405 | -echo " </tr>\n" ; |
|
406 | - |
|
407 | - |
|
408 | -echo '</table></form>'; |
|
409 | -// end of table & form |
|
410 | - |
|
411 | -xoops_cp_footer() ; |
|
401 | + <input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp} |
|
412 | 402 | \ No newline at end of file |