[Fusionforge-commits] FusionForge branch master updated. 37933830cf71a4829c38eb91bb04fbbfe7477eb6

[Marc-Etienne VARGENAU]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  37933830cf71a4829c38eb91bb04fbbfe7477eb6 (commit)
      from  538a2eb4e7ccce6c1b85a8d731bbc376c9508533 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37933830cf71a4829c38eb91bb04fbbfe7477eb6
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Jul 28 10:26:10 2014 +0200

    wiki: remove static

diff --git a/src/plugins/wiki/www/lib/WikiPluginCached.php b/src/plugins/wiki/www/lib/WikiPluginCached.php
index 5836e7a..d0f0088 100644
--- a/src/plugins/wiki/www/lib/WikiPluginCached.php
+++ b/src/plugins/wiki/www/lib/WikiPluginCached.php
@@ -701,7 +701,7 @@ class WikiPluginCached extends WikiPlugin
      * @param  $errorformat string        outputs errors in 'png', 'gif', 'jpg' or 'html'
      * @return bool error status; true=ok; false=error
      */
-    static private function produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat)
+    private function produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat)
     {
         $plugin->resetError();
         $content['html'] = $imagehandle = false;
@@ -807,7 +807,7 @@ class WikiPluginCached extends WikiPlugin
      * @param  string $errorformat         outputs errors in 'png', 'gif', 'jpeg' or 'html'
      * @return bool
      */
-    static public function fetchImageFromCache($dbi, $request, $errorformat = 'png')
+    public function fetchImageFromCache($dbi, $request, $errorformat = 'png')
     {
         $cache = $this->newCache();
         $errorformat = $this->decideImgType($errorformat);
@@ -915,7 +915,7 @@ class WikiPluginCached extends WikiPlugin
      * @param  string $errortext guess what?
      * @return void
      */
-    static protected function printError($imgtype, $errortext)
+    protected function printError($imgtype, $errortext)
     {
         $imgtype = $this->decideImgType($imgtype);
 

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/wiki/www/lib/WikiPluginCached.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge