@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $tbody_mode = false; // if true, then we need to wrap any stray |
89 | 89 | // <tr>s with a <tbody>. |
90 | 90 | |
91 | - $ws_accum =& $initial_ws; |
|
91 | + $ws_accum = & $initial_ws; |
|
92 | 92 | |
93 | 93 | foreach ($children as $node) { |
94 | 94 | if ($node instanceof HTMLPurifier_Node_Comment) { |
@@ -101,13 +101,13 @@ discard block |
||
101 | 101 | // fall through |
102 | 102 | case 'tr': |
103 | 103 | $content[] = $node; |
104 | - $ws_accum =& $content; |
|
104 | + $ws_accum = & $content; |
|
105 | 105 | break; |
106 | 106 | case 'caption': |
107 | 107 | // there can only be one caption! |
108 | 108 | if ($caption !== false) break; |
109 | 109 | $caption = $node; |
110 | - $ws_accum =& $after_caption_ws; |
|
110 | + $ws_accum = & $after_caption_ws; |
|
111 | 111 | break; |
112 | 112 | case 'thead': |
113 | 113 | $tbody_mode = true; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | // turned into <tbody>? Very tricky, indeed. |
120 | 120 | if ($thead === false) { |
121 | 121 | $thead = $node; |
122 | - $ws_accum =& $after_thead_ws; |
|
122 | + $ws_accum = & $after_thead_ws; |
|
123 | 123 | } else { |
124 | 124 | // Oops, there's a second one! What |
125 | 125 | // should we do? Current behavior is to |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | // bottom like it does for the first one. |
133 | 133 | $node->name = 'tbody'; |
134 | 134 | $content[] = $node; |
135 | - $ws_accum =& $content; |
|
135 | + $ws_accum = & $content; |
|
136 | 136 | } |
137 | 137 | break; |
138 | 138 | case 'tfoot': |
@@ -140,17 +140,17 @@ discard block |
||
140 | 140 | $tbody_mode = true; |
141 | 141 | if ($tfoot === false) { |
142 | 142 | $tfoot = $node; |
143 | - $ws_accum =& $after_tfoot_ws; |
|
143 | + $ws_accum = & $after_tfoot_ws; |
|
144 | 144 | } else { |
145 | 145 | $node->name = 'tbody'; |
146 | 146 | $content[] = $node; |
147 | - $ws_accum =& $content; |
|
147 | + $ws_accum = & $content; |
|
148 | 148 | } |
149 | 149 | break; |
150 | 150 | case 'colgroup': |
151 | 151 | case 'col': |
152 | 152 | $cols[] = $node; |
153 | - $ws_accum =& $cols; |
|
153 | + $ws_accum = & $cols; |
|
154 | 154 | break; |
155 | 155 | case '#PCDATA': |
156 | 156 | // How is whitespace handled? We treat is as sticky to |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | // we have to shuffle tr into tbody |
190 | 190 | $current_tr_tbody = null; |
191 | 191 | |
192 | - foreach($content as $node) { |
|
192 | + foreach ($content as $node) { |
|
193 | 193 | switch ($node->name) { |
194 | 194 | case 'tbody': |
195 | 195 | $current_tr_tbody = null; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | return; |
60 | 60 | } |
61 | 61 | |
62 | - $class = 'HTMLPurifier_URIScheme_' . $scheme; |
|
62 | + $class = 'HTMLPurifier_URIScheme_'.$scheme; |
|
63 | 63 | if (!class_exists($class)) { |
64 | 64 | return; |
65 | 65 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | // constants are slow, so we use as few as possible |
4 | 4 | if (!defined('HTMLPURIFIER_PREFIX')) { |
5 | - define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..')); |
|
5 | + define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__).'/..')); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | // accomodations for versions earlier than 5.0.2 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | // Zend extensions such as Zend debugger and APC, this invariant |
47 | 47 | // may be broken. Since we have efficient alternatives, pay |
48 | 48 | // the cost here and avoid the bug. |
49 | - require_once HTMLPURIFIER_PREFIX . '/' . $file; |
|
49 | + require_once HTMLPURIFIER_PREFIX.'/'.$file; |
|
50 | 50 | return true; |
51 | 51 | } |
52 | 52 | |
@@ -63,11 +63,11 @@ discard block |
||
63 | 63 | // Custom implementations |
64 | 64 | if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) { |
65 | 65 | $code = str_replace('_', '-', substr($class, 22)); |
66 | - $file = 'HTMLPurifier/Language/classes/' . $code . '.php'; |
|
66 | + $file = 'HTMLPurifier/Language/classes/'.$code.'.php'; |
|
67 | 67 | } else { |
68 | - $file = str_replace('_', '/', $class) . '.php'; |
|
68 | + $file = str_replace('_', '/', $class).'.php'; |
|
69 | 69 | } |
70 | - if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) { |
|
70 | + if (!file_exists(HTMLPURIFIER_PREFIX.'/'.$file)) { |
|
71 | 71 | return false; |
72 | 72 | } |
73 | 73 | return $file; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | ); |
31 | 31 | return; |
32 | 32 | } |
33 | - $this->_storage[$name] =& $ref; |
|
33 | + $this->_storage[$name] = & $ref; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | $c |
34 | 34 | ); |
35 | 35 | if (!$c) { |
36 | - echo 'Could not update NEWS, missing ' . $l . PHP_EOL; |
|
36 | + echo 'Could not update NEWS, missing '.$l.PHP_EOL; |
|
37 | 37 | exit; |
38 | 38 | } elseif ($c > 1) { |
39 | - echo 'More than one release declaration in NEWS replaced' . PHP_EOL; |
|
39 | + echo 'More than one release declaration in NEWS replaced'.PHP_EOL; |
|
40 | 40 | exit; |
41 | 41 | } |
42 | 42 | file_put_contents('NEWS', $news_c); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | 1, $c |
51 | 51 | ); |
52 | 52 | if (!$c) { |
53 | - echo 'Could not update Doxyfile, missing PROJECT_NUMBER.' . PHP_EOL; |
|
53 | + echo 'Could not update Doxyfile, missing PROJECT_NUMBER.'.PHP_EOL; |
|
54 | 54 | exit; |
55 | 55 | } |
56 | 56 | file_put_contents('Doxyfile', $doxyfile_c); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | 1, $c |
65 | 65 | ); |
66 | 66 | if (!$c) { |
67 | - echo 'Could not update HTMLPurifier.php, missing HTML Purifier [version] header.' . PHP_EOL; |
|
67 | + echo 'Could not update HTMLPurifier.php, missing HTML Purifier [version] header.'.PHP_EOL; |
|
68 | 68 | exit; |
69 | 69 | } |
70 | 70 | $htmlpurifier_c = preg_replace( |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | 1, $c |
75 | 75 | ); |
76 | 76 | if (!$c) { |
77 | - echo 'Could not update HTMLPurifier.php, missing public $version.' . PHP_EOL; |
|
77 | + echo 'Could not update HTMLPurifier.php, missing public $version.'.PHP_EOL; |
|
78 | 78 | exit; |
79 | 79 | } |
80 | 80 | $htmlpurifier_c = preg_replace( |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | 1, $c |
85 | 85 | ); |
86 | 86 | if (!$c) { |
87 | - echo 'Could not update HTMLPurifier.php, missing const $version.' . PHP_EOL; |
|
87 | + echo 'Could not update HTMLPurifier.php, missing const $version.'.PHP_EOL; |
|
88 | 88 | exit; |
89 | 89 | } |
90 | 90 | file_put_contents('library/HTMLPurifier.php', $htmlpurifier_c); |
@@ -97,14 +97,14 @@ discard block |
||
97 | 97 | 1, $c |
98 | 98 | ); |
99 | 99 | if (!$c) { |
100 | - echo 'Could not update Config.php, missing public $version.' . PHP_EOL; |
|
100 | + echo 'Could not update Config.php, missing public $version.'.PHP_EOL; |
|
101 | 101 | exit; |
102 | 102 | } |
103 | 103 | file_put_contents('library/HTMLPurifier/Config.php', $config_c); |
104 | 104 | |
105 | 105 | passthru('php maintenance/flush.php'); |
106 | 106 | |
107 | -if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL; |
|
107 | +if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'".PHP_EOL; |
|
108 | 108 | else echo "Numbers updated to dev, no other modifications necessary!"; |
109 | 109 | |
110 | 110 | // vim: et sw=4 sts=4 |