@@ -481,15 +481,13 @@ |
||
| 481 | 481 | if ($reset) |
| 482 | 482 | { |
| 483 | 483 | static::${$var} = $rules; |
| 484 | - } |
|
| 485 | - elseif ($type === 'uninflected') |
|
| 484 | + } elseif ($type === 'uninflected') |
|
| 486 | 485 | { |
| 487 | 486 | static::$_uninflected = array_merge( |
| 488 | 487 | $rules, |
| 489 | 488 | static::$_uninflected |
| 490 | 489 | ); |
| 491 | - } |
|
| 492 | - else |
|
| 490 | + } else |
|
| 493 | 491 | { |
| 494 | 492 | static::${$var} = $rules + static::${$var}; |
| 495 | 493 | } |
@@ -149,13 +149,11 @@ discard block |
||
| 149 | 149 | { |
| 150 | 150 | $return[] = '<link rel="preload" type="text/css" href="'.lib_css_url($style).'" as="style"> |
| 151 | 151 | <link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" />'; |
| 152 | - } |
|
| 153 | - else if (is_localfile($style)) |
|
| 152 | + } else if (is_localfile($style)) |
|
| 154 | 153 | { |
| 155 | 154 | $return[] = "<!-- The specified file do not exist. we can not load it. \n\t"; |
| 156 | 155 | $return[] = '<link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" /> -->'; |
| 157 | - } |
|
| 158 | - else |
|
| 156 | + } else |
|
| 159 | 157 | { |
| 160 | 158 | $return[] = '<link rel="preload" type="text/css" href="'.lib_css_url($style).'" as="style"> |
| 161 | 159 | <link rel="stylesheet" type="text/css" href="'.lib_css_url($style).'" />'; |
@@ -200,13 +198,11 @@ discard block |
||
| 200 | 198 | if (is_file(WEBROOT.'lib'.DS.str_replace('/', DS, $script))) |
| 201 | 199 | { |
| 202 | 200 | $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script>'; |
| 203 | - } |
|
| 204 | - else if (is_localfile($script)) |
|
| 201 | + } else if (is_localfile($script)) |
|
| 205 | 202 | { |
| 206 | 203 | $return[] = "<!-- The specified file do not exist. we can not load it. \n\t"; |
| 207 | 204 | $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script> -->'; |
| 208 | - } |
|
| 209 | - else |
|
| 205 | + } else |
|
| 210 | 206 | { |
| 211 | 207 | $return[] = '<script type="text/javascript" src="'.lib_js_url($script).'"></script>'; |
| 212 | 208 | } |
@@ -251,13 +247,11 @@ discard block |
||
| 251 | 247 | { |
| 252 | 248 | $return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style"> |
| 253 | 249 | <link rel="stylesheet" type="text/css" href="'.css_url($style).'" />'; |
| 254 | - } |
|
| 255 | - else if (is_localfile($style)) |
|
| 250 | + } else if (is_localfile($style)) |
|
| 256 | 251 | { |
| 257 | 252 | $return[] = "<!-- The specified file do not exist. we can not load it. \n\t"; |
| 258 | 253 | $return[] = '<link rel="stylesheet" type="text/css" href="'.css_url($style).'" /> -->'; |
| 259 | - } |
|
| 260 | - else |
|
| 254 | + } else |
|
| 261 | 255 | { |
| 262 | 256 | $return[] = '<link rel="preload" type="text/css" href="'.css_url($style).'" as="style"> |
| 263 | 257 | <link rel="stylesheet" type="text/css" href="'.css_url($style).'" />'; |
@@ -302,13 +296,11 @@ discard block |
||
| 302 | 296 | if (is_file(WEBROOT.'js'.DS.str_replace('/', DS, $script))) |
| 303 | 297 | { |
| 304 | 298 | $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script>'; |
| 305 | - } |
|
| 306 | - else if (is_localfile($script)) |
|
| 299 | + } else if (is_localfile($script)) |
|
| 307 | 300 | { |
| 308 | 301 | $return[] = "<!-- The specified file do not exist. we can not load it. \n\t"; |
| 309 | 302 | $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script> -->'; |
| 310 | - } |
|
| 311 | - else |
|
| 303 | + } else |
|
| 312 | 304 | { |
| 313 | 305 | $return[] = '<script type="text/javascript" src="'.js_url($script).'"></script>'; |
| 314 | 306 | } |
@@ -381,13 +373,11 @@ discard block |
||
| 381 | 373 | if (is_file(WEBROOT.'less'.DS.str_replace('/', DS, $style))) |
| 382 | 374 | { |
| 383 | 375 | $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" />'; |
| 384 | - } |
|
| 385 | - else if (is_localfile($style)) |
|
| 376 | + } else if (is_localfile($style)) |
|
| 386 | 377 | { |
| 387 | 378 | $return[] = "<!-- The specified file do not exist. we can not load it. \n\t"; |
| 388 | 379 | $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" /> -->'; |
| 389 | - } |
|
| 390 | - else |
|
| 380 | + } else |
|
| 391 | 381 | { |
| 392 | 382 | $return[] = '<link rel="stylesheet" type="text/less" href="'.less_url($style).'" />'; |
| 393 | 383 | } |