summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xclasses/feeds.php2
-rw-r--r--include/colors.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index bae571a3f..642e1dec3 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1924,7 +1924,7 @@ class Feeds extends Handler_Protected {
$sum = 0;
for ($i = 0; $i < strlen($name); $i++) {
- $sum += ord($name{$i});
+ $sum += ord($name[$i]);
}
$sum %= count($colormap);
diff --git a/include/colors.php b/include/colors.php
index c441f7cb1..2ad958e94 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -202,10 +202,13 @@ function _color_unpack($hex, $normalize = false) {
if (strpos($hex, '#') !== 0)
$hex = _resolve_htmlcolor($hex);
+ else
+ $hex = substr($hex, 1);
if (strlen($hex) == 4) {
$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
- } $c = hexdec($hex);
+ }
+ $c = hexdec($hex);
for ($i = 16; $i >= 0; $i -= 8) {
$out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
} return $out;