Hannesalm /
EventCalendar
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | public function callbackUndoCommentSubst($matches) |
| 233 | 233 | { |
| 234 | - return '<!--' . strtr($matches[1], array('&' => '&', '<' => '<')) . $matches[2]; |
|
| 234 | + return '<!--'.strtr($matches[1], array('&' => '&', '<' => '<')).$matches[2]; |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | /** |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | */ |
| 243 | 243 | public function callbackArmorCommentEntities($matches) |
| 244 | 244 | { |
| 245 | - return '<!--' . str_replace('&', '&', $matches[1]) . $matches[2]; |
|
| 245 | + return '<!--'.str_replace('&', '&', $matches[1]).$matches[2]; |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | /** |
@@ -260,10 +260,10 @@ discard block |
||
| 260 | 260 | if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) { |
| 261 | 261 | $ret .= '<!DOCTYPE html '; |
| 262 | 262 | if (!empty($def->doctype->dtdPublic)) { |
| 263 | - $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" '; |
|
| 263 | + $ret .= 'PUBLIC "'.$def->doctype->dtdPublic.'" '; |
|
| 264 | 264 | } |
| 265 | 265 | if (!empty($def->doctype->dtdSystem)) { |
| 266 | - $ret .= '"' . $def->doctype->dtdSystem . '" '; |
|
| 266 | + $ret .= '"'.$def->doctype->dtdSystem.'" '; |
|
| 267 | 267 | } |
| 268 | 268 | $ret .= '>'; |
| 269 | 269 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $ret .= '<html><head>'; |
| 272 | 272 | $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; |
| 273 | 273 | // No protection if $html contains a stray </div>! |
| 274 | - $ret .= '</head><body>' . $html . '</body></html>'; |
|
| 274 | + $ret .= '</head><body>'.$html.'</body></html>'; |
|
| 275 | 275 | return $ret; |
| 276 | 276 | } |
| 277 | 277 | } |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | if (is_string($content_model)) { |
| 90 | 90 | // Assume that $this->keys is alphanumeric |
| 91 | 91 | $def->content_model = preg_replace_callback( |
| 92 | - '/\b(' . implode('|', $this->keys) . ')\b/', |
|
| 92 | + '/\b('.implode('|', $this->keys).')\b/', |
|
| 93 | 93 | array($this, 'generateChildDefCallback'), |
| 94 | 94 | $content_model |
| 95 | 95 | ); |
@@ -18,17 +18,17 @@ |
||
| 18 | 18 | public function validateToken($token, $config, $context) |
| 19 | 19 | { |
| 20 | 20 | $definition = $config->getHTMLDefinition(); |
| 21 | - $e =& $context->get('ErrorCollector', true); |
|
| 21 | + $e = & $context->get('ErrorCollector', true); |
|
| 22 | 22 | |
| 23 | 23 | // initialize IDAccumulator if necessary |
| 24 | - $ok =& $context->get('IDAccumulator', true); |
|
| 24 | + $ok = & $context->get('IDAccumulator', true); |
|
| 25 | 25 | if (!$ok) { |
| 26 | 26 | $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context); |
| 27 | 27 | $context->register('IDAccumulator', $id_accumulator); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // initialize CurrentToken if necessary |
| 31 | - $current_token =& $context->get('CurrentToken', true); |
|
| 31 | + $current_token = & $context->get('CurrentToken', true); |
|
| 32 | 32 | if (!$current_token) { |
| 33 | 33 | $context->register('CurrentToken', $token); |
| 34 | 34 | } |
@@ -32,8 +32,8 @@ |
||
| 32 | 32 | public function generateKey($config) |
| 33 | 33 | { |
| 34 | 34 | return $config->version . ',' . // possibly replace with function calls |
| 35 | - $config->getBatchSerial($this->type) . ',' . |
|
| 36 | - $config->get($this->type . '.DefinitionRev'); |
|
| 35 | + $config->getBatchSerial($this->type) . ',' . |
|
| 36 | + $config->get($this->type . '.DefinitionRev'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function generateKey($config) |
| 33 | 33 | { |
| 34 | - return $config->version . ',' . // possibly replace with function calls |
|
| 35 | - $config->getBatchSerial($this->type) . ',' . |
|
| 36 | - $config->get($this->type . '.DefinitionRev'); |
|
| 34 | + return $config->version.','.// possibly replace with function calls |
|
| 35 | + $config->getBatchSerial($this->type).','. |
|
| 36 | + $config->get($this->type.'.DefinitionRev'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | // versions match, ids match, check revision number |
| 58 | 58 | if ($hash == $config->getBatchSerial($this->type) && |
| 59 | - $revision < $config->get($this->type . '.DefinitionRev')) { |
|
| 59 | + $revision < $config->get($this->type.'.DefinitionRev')) { |
|
| 60 | 60 | return true; |
| 61 | 61 | } |
| 62 | 62 | return false; |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | $content = array(); |
| 87 | 87 | |
| 88 | 88 | $tbody_mode = false; // if true, then we need to wrap any stray |
| 89 | - // <tr>s with a <tbody>. |
|
| 89 | + // <tr>s with a <tbody>. |
|
| 90 | 90 | |
| 91 | 91 | $ws_accum =& $initial_ws; |
| 92 | 92 | |
@@ -96,71 +96,71 @@ discard block |
||
| 96 | 96 | continue; |
| 97 | 97 | } |
| 98 | 98 | switch ($node->name) { |
| 99 | - case 'tbody': |
|
| 100 | - $tbody_mode = true; |
|
| 101 | - // fall through |
|
| 102 | - case 'tr': |
|
| 103 | - $content[] = $node; |
|
| 104 | - $ws_accum =& $content; |
|
| 105 | - break; |
|
| 106 | - case 'caption': |
|
| 107 | - // there can only be one caption! |
|
| 108 | - if ($caption !== false) break; |
|
| 109 | - $caption = $node; |
|
| 110 | - $ws_accum =& $after_caption_ws; |
|
| 111 | - break; |
|
| 112 | - case 'thead': |
|
| 113 | - $tbody_mode = true; |
|
| 114 | - // XXX This breaks rendering properties with |
|
| 115 | - // Firefox, which never floats a <thead> to |
|
| 116 | - // the top. Ever. (Our scheme will float the |
|
| 117 | - // first <thead> to the top.) So maybe |
|
| 118 | - // <thead>s that are not first should be |
|
| 119 | - // turned into <tbody>? Very tricky, indeed. |
|
| 120 | - if ($thead === false) { |
|
| 121 | - $thead = $node; |
|
| 122 | - $ws_accum =& $after_thead_ws; |
|
| 123 | - } else { |
|
| 124 | - // Oops, there's a second one! What |
|
| 125 | - // should we do? Current behavior is to |
|
| 126 | - // transmutate the first and last entries into |
|
| 127 | - // tbody tags, and then put into content. |
|
| 128 | - // Maybe a better idea is to *attach |
|
| 129 | - // it* to the existing thead or tfoot? |
|
| 130 | - // We don't do this, because Firefox |
|
| 131 | - // doesn't float an extra tfoot to the |
|
| 132 | - // bottom like it does for the first one. |
|
| 133 | - $node->name = 'tbody'; |
|
| 134 | - $content[] = $node; |
|
| 135 | - $ws_accum =& $content; |
|
| 136 | - } |
|
| 137 | - break; |
|
| 138 | - case 'tfoot': |
|
| 139 | - // see above for some aveats |
|
| 140 | - $tbody_mode = true; |
|
| 141 | - if ($tfoot === false) { |
|
| 142 | - $tfoot = $node; |
|
| 143 | - $ws_accum =& $after_tfoot_ws; |
|
| 144 | - } else { |
|
| 145 | - $node->name = 'tbody'; |
|
| 99 | + case 'tbody': |
|
| 100 | + $tbody_mode = true; |
|
| 101 | + // fall through |
|
| 102 | + case 'tr': |
|
| 146 | 103 | $content[] = $node; |
| 147 | 104 | $ws_accum =& $content; |
| 148 | - } |
|
| 149 | - break; |
|
| 150 | - case 'colgroup': |
|
| 151 | - case 'col': |
|
| 152 | - $cols[] = $node; |
|
| 153 | - $ws_accum =& $cols; |
|
| 154 | - break; |
|
| 155 | - case '#PCDATA': |
|
| 156 | - // How is whitespace handled? We treat is as sticky to |
|
| 157 | - // the *end* of the previous element. So all of the |
|
| 158 | - // nonsense we have worked on is to keep things |
|
| 159 | - // together. |
|
| 160 | - if (!empty($node->is_whitespace)) { |
|
| 161 | - $ws_accum[] = $node; |
|
| 162 | - } |
|
| 163 | - break; |
|
| 105 | + break; |
|
| 106 | + case 'caption': |
|
| 107 | + // there can only be one caption! |
|
| 108 | + if ($caption !== false) break; |
|
| 109 | + $caption = $node; |
|
| 110 | + $ws_accum =& $after_caption_ws; |
|
| 111 | + break; |
|
| 112 | + case 'thead': |
|
| 113 | + $tbody_mode = true; |
|
| 114 | + // XXX This breaks rendering properties with |
|
| 115 | + // Firefox, which never floats a <thead> to |
|
| 116 | + // the top. Ever. (Our scheme will float the |
|
| 117 | + // first <thead> to the top.) So maybe |
|
| 118 | + // <thead>s that are not first should be |
|
| 119 | + // turned into <tbody>? Very tricky, indeed. |
|
| 120 | + if ($thead === false) { |
|
| 121 | + $thead = $node; |
|
| 122 | + $ws_accum =& $after_thead_ws; |
|
| 123 | + } else { |
|
| 124 | + // Oops, there's a second one! What |
|
| 125 | + // should we do? Current behavior is to |
|
| 126 | + // transmutate the first and last entries into |
|
| 127 | + // tbody tags, and then put into content. |
|
| 128 | + // Maybe a better idea is to *attach |
|
| 129 | + // it* to the existing thead or tfoot? |
|
| 130 | + // We don't do this, because Firefox |
|
| 131 | + // doesn't float an extra tfoot to the |
|
| 132 | + // bottom like it does for the first one. |
|
| 133 | + $node->name = 'tbody'; |
|
| 134 | + $content[] = $node; |
|
| 135 | + $ws_accum =& $content; |
|
| 136 | + } |
|
| 137 | + break; |
|
| 138 | + case 'tfoot': |
|
| 139 | + // see above for some aveats |
|
| 140 | + $tbody_mode = true; |
|
| 141 | + if ($tfoot === false) { |
|
| 142 | + $tfoot = $node; |
|
| 143 | + $ws_accum =& $after_tfoot_ws; |
|
| 144 | + } else { |
|
| 145 | + $node->name = 'tbody'; |
|
| 146 | + $content[] = $node; |
|
| 147 | + $ws_accum =& $content; |
|
| 148 | + } |
|
| 149 | + break; |
|
| 150 | + case 'colgroup': |
|
| 151 | + case 'col': |
|
| 152 | + $cols[] = $node; |
|
| 153 | + $ws_accum =& $cols; |
|
| 154 | + break; |
|
| 155 | + case '#PCDATA': |
|
| 156 | + // How is whitespace handled? We treat is as sticky to |
|
| 157 | + // the *end* of the previous element. So all of the |
|
| 158 | + // nonsense we have worked on is to keep things |
|
| 159 | + // together. |
|
| 160 | + if (!empty($node->is_whitespace)) { |
|
| 161 | + $ws_accum[] = $node; |
|
| 162 | + } |
|
| 163 | + break; |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
@@ -191,25 +191,25 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | foreach($content as $node) { |
| 193 | 193 | switch ($node->name) { |
| 194 | - case 'tbody': |
|
| 195 | - $current_tr_tbody = null; |
|
| 196 | - $ret[] = $node; |
|
| 197 | - break; |
|
| 198 | - case 'tr': |
|
| 199 | - if ($current_tr_tbody === null) { |
|
| 200 | - $current_tr_tbody = new HTMLPurifier_Node_Element('tbody'); |
|
| 201 | - $ret[] = $current_tr_tbody; |
|
| 202 | - } |
|
| 203 | - $current_tr_tbody->children[] = $node; |
|
| 204 | - break; |
|
| 205 | - case '#PCDATA': |
|
| 206 | - assert($node->is_whitespace); |
|
| 207 | - if ($current_tr_tbody === null) { |
|
| 194 | + case 'tbody': |
|
| 195 | + $current_tr_tbody = null; |
|
| 208 | 196 | $ret[] = $node; |
| 209 | - } else { |
|
| 197 | + break; |
|
| 198 | + case 'tr': |
|
| 199 | + if ($current_tr_tbody === null) { |
|
| 200 | + $current_tr_tbody = new HTMLPurifier_Node_Element('tbody'); |
|
| 201 | + $ret[] = $current_tr_tbody; |
|
| 202 | + } |
|
| 210 | 203 | $current_tr_tbody->children[] = $node; |
| 211 | - } |
|
| 212 | - break; |
|
| 204 | + break; |
|
| 205 | + case '#PCDATA': |
|
| 206 | + assert($node->is_whitespace); |
|
| 207 | + if ($current_tr_tbody === null) { |
|
| 208 | + $ret[] = $node; |
|
| 209 | + } else { |
|
| 210 | + $current_tr_tbody->children[] = $node; |
|
| 211 | + } |
|
| 212 | + break; |
|
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | } else { |
@@ -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; |
@@ -105,7 +105,9 @@ |
||
| 105 | 105 | break; |
| 106 | 106 | case 'caption': |
| 107 | 107 | // there can only be one caption! |
| 108 | - if ($caption !== false) break; |
|
| 108 | + if ($caption !== false) {
|
|
| 109 | + break; |
|
| 110 | + } |
|
| 109 | 111 | $caption = $node; |
| 110 | 112 | $ws_accum =& $after_caption_ws; |
| 111 | 113 | break; |
@@ -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 | /** |
@@ -25,21 +25,21 @@ |
||
| 25 | 25 | |
| 26 | 26 | // ...in NEWS |
| 27 | 27 | if ($is_dev = (strpos($version, 'dev') === false)) { |
| 28 | - $date = date('Y-m-d'); |
|
| 29 | - $news_c = str_replace( |
|
| 30 | - $l = "$version, unknown release date", |
|
| 31 | - "$version, released $date", |
|
| 32 | - file_get_contents('NEWS'), |
|
| 33 | - $c |
|
| 34 | - ); |
|
| 35 | - if (!$c) { |
|
| 36 | - echo 'Could not update NEWS, missing ' . $l . PHP_EOL; |
|
| 37 | - exit; |
|
| 38 | - } elseif ($c > 1) { |
|
| 39 | - echo 'More than one release declaration in NEWS replaced' . PHP_EOL; |
|
| 40 | - exit; |
|
| 41 | - } |
|
| 42 | - file_put_contents('NEWS', $news_c); |
|
| 28 | + $date = date('Y-m-d'); |
|
| 29 | + $news_c = str_replace( |
|
| 30 | + $l = "$version, unknown release date", |
|
| 31 | + "$version, released $date", |
|
| 32 | + file_get_contents('NEWS'), |
|
| 33 | + $c |
|
| 34 | + ); |
|
| 35 | + if (!$c) { |
|
| 36 | + echo 'Could not update NEWS, missing ' . $l . PHP_EOL; |
|
| 37 | + exit; |
|
| 38 | + } elseif ($c > 1) { |
|
| 39 | + echo 'More than one release declaration in NEWS replaced' . PHP_EOL; |
|
| 40 | + exit; |
|
| 41 | + } |
|
| 42 | + file_put_contents('NEWS', $news_c); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | // ...in Doxyfile |
@@ -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 |
@@ -104,7 +104,10 @@ |
||
| 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; |
|
| 108 | -else echo "Numbers updated to dev, no other modifications necessary!"; |
|
| 107 | +if ($is_dev) {
|
|
| 108 | + echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL; |
|
| 109 | +} else {
|
|
| 110 | + echo "Numbers updated to dev, no other modifications necessary!"; |
|
| 111 | +} |
|
| 109 | 112 | |
| 110 | 113 | // vim: et sw=4 sts=4 |
