mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 21:26:58 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Awilum
2012-11-27 18:11:06 +02:00
parent b5754ecc69 cc968ed072
commit 0892079698
8 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -30,7 +30,7 @@ Fast and small content management system written in PHP!
## Links
- [Site](http://punbb.informer.com/wiki/)
- [Site](http://monstra.org)
- [Forum](http://forum.monstra.org)
- [Documentation](http://monstra.org/documentation)
- [Github Repository](https://github.com/Awilum/monstra-cms)

3
monstra/engine/shortcodes.php
View File

@@ -180,7 +180,8 @@
}
}
return $prefix . call_user_func(Shortcode::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix;
// Check if this shortcode realy exists then call user function else return empty string
return (isset(Shortcode::$shortcode_tags[$shortcode])) ? $prefix . call_user_func(Shortcode::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix : '';
}
}

4
monstra/helpers/text.php
View File

@@ -230,6 +230,10 @@
/**
* Add's _1 to a string or increment the ending number to allow _2, _3, etc
*
* <code>
* $str = Text::increment($str);
* </code>
*
* @param string $str String to increment
* @param integer $first Start with
* @param string $separator Separator

2
plugins/box/system/system.admin.php
View File

@@ -58,7 +58,7 @@
// Get all pages
$pages_array = array();
$pages_list = $pages->select('[slug!="error404" and parent="" and status="published" and access="public"]');
$pages_list = $pages->select('[slug!="error404" and parent="" and status="published"]');
foreach ($pages_list as $page) {
$pages_array[$page['slug']] = Html::toText($page['title']);
}

2
plugins/box/users/languages/it.lang.php
View File

@@ -33,7 +33,7 @@
'Old password' => 'Vecchia password',
'New password' => 'Nuova password',
'Welcome' => 'Benvenuto',
'Wrong <b>login</b> or <b>password</b>' => '<b>Login</b> o <b>password</b> errata',
'Wrong <b>username</b> or <b>password</b>' => '<b>username</b> o <b>password</b> errata',
'Your changes have been saved.' => 'Le modifiche sono state salvate.',
'New user have been registered.' => 'Nuovo utente è stato registrato.',
'Captcha' => 'Codice captcha',

2
plugins/box/users/languages/ru.lang.php
View File

@@ -33,7 +33,7 @@
'Old password' => 'Старый пароль',
'New password' => 'Новый пароль',
'Welcome' => 'Добро пожаловать',
'Wrong <b>login</b> or <b>password</b>' => 'Неправильный <b>логин</b> или <b>пароль</b>',
'Wrong <b>username</b> or <b>password</b>' => 'Неправильный <b>логин</b> или <b>пароль</b>',
'Your changes have been saved.' => 'Ваши изменения были сохранены.',
'New user have been registered.' => 'Новый пользователь был зарегистрирован.',
'Captcha' => 'Каптча',

2
plugins/box/users/languages/uk.lang.php
View File

@@ -33,7 +33,7 @@
'Old password' => 'Старий пароль',
'New password' => 'Новий пароль',
'Welcome' => 'Ласкаво просимо',
'Wrong <b>login</b> or <b>password</b>' => 'Неправильний <b>логін</b> або <b>пароль</b>',
'Wrong <b>username</b> or <b>password</b>' => 'Неправильний <b>логін</b> або <b>пароль</b>',
'Your changes have been saved.' => 'Ваші зміни були збережені.',
'New user have been registered.' => 'Новий користувач був зареєстрований.',
'Captcha' => 'Каптча',

4
plugins/box/users/users.plugin.php
View File

@@ -393,11 +393,11 @@
Session::set('user_role', (string)$user['role']);
Request::redirect(Site::url().'users/'.Session::get('user_id'));
} else {
Notification::setNow('error', __('Wrong <b>login</b> or <b>password</b>', 'users'));
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
}
}
} else {
Notification::setNow('error', __('Wrong <b>login</b> or <b>password</b>', 'users'));
Notification::setNow('error', __('Wrong <b>username</b> or <b>password</b>', 'users'));
}
} else { die('csrf detected!'); }