Browse Source

Prepare release + bugs fix

Prepare release, improvements, and bugs fix  #226
pull/255/head
Danang Probo Sayekti 10 years ago
parent
commit
d4e6139011
3 changed files with 13 additions and 3 deletions
  1. +1
    -1
      cache/installedVersion.json
  2. +2
    -0
      system/admin/admin.php
  3. +10
    -2
      system/includes/functions.php

+ 1
- 1
cache/installedVersion.json View File

@ -1,4 +1,4 @@
{
"id": 782014,
"tag_name": "v2.6.4"
"tag_name": "v2.6.5"
}

+ 2
- 0
system/admin/admin.php View File

@ -57,6 +57,8 @@ function session($user, $pass)
}
$_SESSION[config("site.url")]['user'] = $user;
header('location: admin');
} else {
return $str = '<li>Your username and password mismatch.</li>';
}
} else if (old_password_verify($pass, $user_enc, $user_pass)) {
update_user($user, $pass, $user_role);


+ 10
- 2
system/includes/functions.php View File

@ -1665,7 +1665,7 @@ function menu($custom = null)
echo '<li class="' . $class . '"><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></li>';
}
} else {
echo '<li class="' . $class . '"><a target="_blank" href="' . $anc[1] . '">' . $anc[0] . '</a></li>';
echo '<li class="' . $class . '"><a href="' . $anc[1] . '">' . $anc[0] . '</a></li>';
}
}
} else {
@ -1704,11 +1704,19 @@ function get_menu($custom)
krsort($posts);
echo '<ul class="nav navbar-nav ' . $custom . '">';
if ($req == site_path() . '/') {
if ($req == site_path() . '/' || stripos($req, site_path() . '/?page') !== false) {
echo '<li class="item first active"><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></li>';
} else {
echo '<li class="item first"><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></li>';
}
if (config('blog.enable') == 'true' ) {
if ($req == site_path() . '/blog' || stripos($req, site_path() . '/blog?page') !== false) {
echo '<li class="item active"><a href="' . site_url() . 'blog">' . 'Blog' . '</a></li>';
} else {
echo '<li class="item"><a href="' . site_url() . 'blog">' . 'Blog' . '</a></li>';
}
}
$i = 0;
$len = count($posts);


Loading…
Cancel
Save