oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'friendika/master' into newui

Browse source
This commit is contained in:
Fabio Comuni 2011-09-05 09:09:34 +02:00
commit 0283cbfcd3
46 changed files with 3080 additions and 1365 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/admin.php
View file

@ -344,7 +344,7 @@ function admin_page_site(&$a) {
* Users admin page
*/
function admin_page_users_post(&$a){
$pending = ( x(£_POST, 'pending') ? $_POST['pending'] : Array() );
$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
$users = ( x($_POST, 'user') ? $_POST['user'] : Array() );
if (x($_POST,'page_users_block')){
@ -632,7 +632,7 @@ function admin_page_logs(&$a){
$f = get_config('system','logfile');
$size = filesize($f);
if($size > 5000000)
if($size > 5000000 || $size < 0)
$size = 5000000;
$data = '';