Resolved differences merging 2.5.x into saas

2014-10-27 16:25:42 -04:00 · 2014-10-27 16:25:42 -04:00 · 275ca5eed6
commit 275ca5eed6
parent 0196aa21f5 d4e8eed51d
31 changed files with 832 additions and 326 deletions
--- a/airtime_mvc/application/views/scripts/form/edit-user.phtml
+++ b/airtime_mvc/application/views/scripts/form/edit-user.phtml
@ -166,6 +166,10 @@
                </ul>
            <?php endif; ?> 
        </dd>
+
+        <?php echo $this->element->getElement('csrf') ?>
+
+        <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
    </dl>
    <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
 </form>