Merge pull request #1059 from ngodfraind/master

version + removing method from importer abstract class
claroline · Mar 13, 2015 · 451a258 · 451a258
2 parents 955f8bf + fd4379c
commit 451a258
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Library/Transfert/ConfigurationBuilders/GroupsImporter.php b/Library/Transfert/ConfigurationBuilders/GroupsImporter.php
@@ -201,6 +201,11 @@ public function export(Workspace $workspace, array &$files, $object)
         return array();
     }
 
+    public function import(array $data)
+    {
+
+    }
+
     public static function nameAlreadyExistsInDatabase($v, $groups)
     {
         return in_array($v, $groups);

diff --git a/Library/Transfert/Importer.php b/Library/Transfert/Importer.php
@@ -136,4 +136,4 @@ abstract function validate(array $data);
      * @param mixed $object
      */
      abstract function export(Workspace $workspace, array &$files, $object);
-} 
+}
diff --git a/Resources/views/Layout/footer.html.twig b/Resources/views/Layout/footer.html.twig
@@ -13,7 +13,7 @@
                     <span class="pull-right locale-select label label-default">{{ app.request.locale | upper }}</span>
                 {% endif %}
 
-                {% if not footerMessage is empty %}{{ footerMessage|raw }}{% endif %}
+                {% if footerMessage is defined and footerMessage %}{{ footerMessage|raw }}{% endif %}
                 <span{% if ((footerLogin or footerWorkspaces) and not is_granted('ROLE_USER')) or not footerMessage is empty %} class="pull-right"{% endif %}>
                     {{ 'Powered by' | trans({}, 'platform') }} <a href="http://www.claroline.net">Claroline</a> (v{{ coreVersion }})
                 </span>
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,4 +136,4 @@ abstract function validate(array $data); @@
          * @param mixed $object
          */
          abstract function export(Workspace $workspace, array &$files, $object);
-    }
+    }