Merge "Bug 1656934: Adding new logo in built-in themes."

htdocs/lib/db/upgrade.php

@@ -4856,5 +4856,10 @@ function xmldb_core_upgrade($oldversion=0) {
             WHERE (institution IS NULL OR institution = '') AND deleted = 0", array());
     }
 
+    if ($oldversion < 2017011800) {
+        log_debug('Bump cache version to fetch new favicon');
+        bump_cache_version();
+    }
+
     return $status;
 }

htdocs/lib/version.php

@@ -16,7 +16,7 @@ $config = new stdClass();
 // See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
 // For upgrades on stable branches, increment the version by one.  On master, use the date.
 
-$config->version = 2016122300;
+$config->version = 2017011800;
 $config->series = '17.04';
 $config->release = '17.04dev';
 $config->minupgradefrom = 2012080604;

htdocs/theme/default/templates/footer.tpl

@@ -27,7 +27,7 @@
             <div class="footer-inner container">
                 <div id="powered-by" class="pull-left mahara-logo">
                     <a href="https://mahara.org/">
-                        <img src="{theme_url filename='images/powered_by_mahara.png'}" alt="Powered by Mahara">
+                        <img src="{theme_url filename='images/powered_by_mahara.png'}?v={$CACHEVERSION}" alt="Powered by Mahara">
                     </a>
                 </div>
                 <!-- This site is powered by Mahara, an Open Source

htdocs/theme/raw/templates/admin/upgradefooter.tpl

@@ -4,7 +4,7 @@
     </div>
     <div id="footer-wrap">
 		<div class="cb"></div>
-    	<div id="powered-by"><a href="https://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}" border="0" alt=""></a></div>
+        <div id="powered-by"><a href="https://mahara.org/"><img src="{theme_url filename='images/powered_by_mahara.png'}?v={$CACHEVERSION}" border="0" alt=""></a></div>
         <div id="release"><a href="https://mahara.org/">Mahara</a> {if $releaseargs}{str section=admin tag=release args=$releaseargs}{/if}, {str tag='copyright' section='admin'}</div>
 		<div class="cb"></div>
     </div>

htdocs/theme/raw/templates/footer.tpl

@@ -26,7 +26,7 @@
     <div class="footer-inner container">
         <div id="powered-by" class="pull-left mahara-logo">
             <a href="https://mahara.org/">
-                <img src="{theme_url filename='images/powered_by_mahara.png'}" alt="Powered by Mahara">
+                <img src="{theme_url filename='images/powered_by_mahara.png'}?v={$CACHEVERSION}" alt="Powered by Mahara">
             </a>
         </div>
         <!-- This site is powered by Mahara, an Open Source