Merge branch 'master' of ssh://git.mageia.org/software/adminpanel

1 files changed, 5 insertions, 16 deletions

diff --git a/lib/AdminPanel/Shared.pm b/lib/AdminPanel/Shared.pm
index 3165bf04..b6c8fe15 100644
--- a/lib/AdminPanel/Shared.pm
+++ b/lib/AdminPanel/Shared.pm
@@ -112,7 +112,8 @@ $filename the name of the file to read
 
 =head3 OUTPUT
 
-$content the content of the selected text file inside
+depending from the context it returns the content 
+of the file as an array or a string
 
 =head3 DESCRIPTION
 
@@ -123,28 +124,16 @@ if it fails
 
 #=============================================================
 
-#sub apcat {
-#    my $fn = shift();
-#    my $fh = undef;
-#    my @content = ();
-#    open($fh, "<", $fn) || return 0;
-#    while(<$fh>)
-#    {
-#        push(@content,$_);
-#    }
-#    return \@content;
-#}
-
 sub apcat {
     my $fn = shift();
     my $fh = undef;
-    my $content = undef;
+    my @content = ();
     open($fh, "<", $fn) || return 0;
     while(<$fh>)
     {
-        $content .= $_;
+        push(@content, $_);
     }
-    return $content;
+    return (wantarray() ? @content : join('',@content));
 }