Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmisc/cron/archive.sh12
-rw-r--r--plugins/CoreAdminHome/API.php2
2 files changed, 9 insertions, 5 deletions
diff --git a/misc/cron/archive.sh b/misc/cron/archive.sh
index 6877f82f9d..32d8b348e4 100755
--- a/misc/cron/archive.sh
+++ b/misc/cron/archive.sh
@@ -77,9 +77,12 @@ for idsite in $ID_SITES; do
$CMD
for segment in $SEGMENTS_TO_ARCHIVE; do
- echo " - Archiving for visitor segment $segment ..."
- CMD_ARCHIVE_SEGMENT="${CMD}&segment=$segment"
- $CMD_ARCHIVE_SEGMENT
+ if test $segment != "value"; then
+ echo ""
+ echo " - Archiving for visitor segment $segment ..."
+ CMD_ARCHIVE_SEGMENT="${CMD}&segment=$segment"
+ $CMD_ARCHIVE_SEGMENT
+ fi
done
done
@@ -89,10 +92,11 @@ for idsite in $ID_SITES; do
done
echo "Reports archiving finished."
-
+echo "---------------------------"
echo "Starting Scheduled tasks..."
echo ""
CMD="$PHP_BIN -q $PIWIK_PATH -- module=API&method=CoreAdminHome.runScheduledTasks&format=csv&convertToUnicode=0&token_auth=$TOKEN_AUTH"
$CMD
+echo ""
echo "Finished Scheduled tasks."
echo ""
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 5a300d5122..efb82aacdd 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -40,6 +40,6 @@ class Piwik_CoreAdminHome_API
{
Piwik::checkUserIsSuperUser();
$segments = Zend_Registry::get('config')->Segments->toArray();
- return isset($segments['Segments']) ? $segments['Segments'] : array();
+ return isset($segments['Segments']) ? $segments['Segments'] : '';
}
}