| Index: branches/wmf/1.17wmf1/extensions/DoubleWiki/DoubleWiki_body.php |
| — | — | @@ -109,7 +109,6 @@ |
| 110 | 110 | return true; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | | - |
| 114 | 113 | /* |
| 115 | 114 | * Format the text as a two-column table with aligned paragraphs |
| 116 | 115 | */ |
| — | — | @@ -193,8 +192,6 @@ |
| 194 | 193 | return $head . $body . "</table>" ; |
| 195 | 194 | } |
| 196 | 195 | |
| 197 | | - |
| 198 | | - |
| 199 | 196 | /* |
| 200 | 197 | * Split text and return a set of html-balanced paragraphs |
| 201 | 198 | */ |
| — | — | @@ -223,7 +220,6 @@ |
| 224 | 221 | return $result; |
| 225 | 222 | } |
| 226 | 223 | |
| 227 | | - |
| 228 | 224 | /* |
| 229 | 225 | * Split text and return a set of html-balanced slices |
| 230 | 226 | */ |
| — | — | @@ -255,7 +251,6 @@ |
| 256 | 252 | $opening = ''; |
| 257 | 253 | |
| 258 | 254 | for( $i=0 ; $i < $n ; $i++) { |
| 259 | | - $bits = preg_split( $this->tags, $left_slices[$i] ); |
| 260 | 255 | preg_match_all( $this->tags, $left_slices[$i], $m, PREG_SET_ORDER); |
| 261 | 256 | $counter = 0; |
| 262 | 257 | for($k=0 ; $k < count($m) ; $k++) { |
| — | — | @@ -264,7 +259,7 @@ |
| 265 | 260 | $counter++; |
| 266 | 261 | array_push($stack, $t); |
| 267 | 262 | } else { |
| 268 | | - $tt = array_pop($stack); |
| | 263 | + array_pop($stack); |
| 269 | 264 | $counter--; |
| 270 | 265 | } |
| 271 | 266 | } |
| — | — | @@ -278,7 +273,7 @@ |
| 279 | 274 | } else if( $i == $n - 1 ) { |
| 280 | 275 | $left_slices[$i] = $opening . $left_slices[$i]; |
| 281 | 276 | } else if( $counter != 0 ) { |
| 282 | | - $left_slices[$i+1] = $left_slices[$i] . $left_slices[$i+1]; |
| | 277 | + $left_slices[$i + 1] = $left_slices[$i] . $left_slices[$i+1]; |
| 283 | 278 | $left_slices[$i] = ''; |
| 284 | 279 | } |
| 285 | 280 | } |
| Property changes on: branches/wmf/1.17wmf1/extensions/DoubleWiki |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 286 | 281 | Merged /trunk/extensions/DoubleWiki:r81672 |
| 287 | 282 | Merged /branches/sqlite/extensions/DoubleWiki:r58211-58321 |
| 288 | 283 | Merged /trunk/phase3/extensions/DoubleWiki:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833 |
| 289 | 284 | Merged /branches/new-installer/phase3/extensions/DoubleWiki:r43664-66004 |
| 290 | 285 | Merged /branches/wmf-deployment/extensions/DoubleWiki:r60970 |
| 291 | 286 | Merged /branches/REL1_15/phase3/extensions/DoubleWiki:r51646 |
| 292 | 287 | Merged /branches/wmf/1.16wmf4/extensions/DoubleWiki:r67177,69199,76243,77266 |