summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorSimon Rettberg2014-10-06 19:30:38 +0200
committerSimon Rettberg2014-10-06 19:30:38 +0200
commit9792e13f6ef1c9855ebe0736e7a1effc535dac76 (patch)
tree07516ae42f0508c395f91607d94db7dcf92e4f06 /modules
parentUse eventlog in init and update API, populate database with default values on... (diff)
downloadslx-admin-9792e13f6ef1c9855ebe0736e7a1effc535dac76.tar.gz
slx-admin-9792e13f6ef1c9855ebe0736e7a1effc535dac76.tar.xz
slx-admin-9792e13f6ef1c9855ebe0736e7a1effc535dac76.zip
Minor fixes and improvements
Diffstat (limited to 'modules')
-rw-r--r--modules/minilinux.inc.php2
-rw-r--r--modules/translation.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/minilinux.inc.php b/modules/minilinux.inc.php
index 36a097b5..df2a0839 100644
--- a/modules/minilinux.inc.php
+++ b/modules/minilinux.inc.php
@@ -25,7 +25,7 @@ class Page_MiniLinux extends Page
$data = Property::getVersionCheckInformation();
if (!is_array($data) || !isset($data['systems'])) {
echo Render::parse('messagebox-error', array(
- 'message' => 'Failed to retrieve the list: ' . $data
+ 'message' => 'Failed to retrieve the list: ' . print_r($data, true)
));
return;
}
diff --git a/modules/translation.inc.php b/modules/translation.inc.php
index d42066f3..15733b73 100644
--- a/modules/translation.inc.php
+++ b/modules/translation.inc.php
@@ -271,7 +271,7 @@ class Page_Translation extends Page
*/
private function loadHardcodedStringEditArray()
{
- $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"](.*?)[\'"]\s*[\)\,]/i');
+ $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"](.*?)[\'"]\s*\)/i');
if ($tags === false)
return false;
return $this->buildTranslationTable('messages-hardcoded', $tags);