Merge branch 'dev' of https://github.com/OUSL-GROUP-BrinaryBrains/Sch…

…ool-Student-Management-System into dev
OUSL-GROUP-BrinaryBrains · Nov 30, 2023 · ea789e5 · ea789e5
2 parents dd5856d + bdf0362
commit ea789e5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 68 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/application/controllers/Admin.php b/application/controllers/Admin.php
@@ -615,7 +615,7 @@ function manage_profile($param1 = '', $param2 = '', $param3 = '')
                 ));
                 $this->session->set_flashdata('flash_success', 'Account Password Updated!');
             } else {
-                $this->session->set_flashdata('flash_error_message', 'Password is Not Matching!');
+                $this->session->set_flashdata('flash_error', 'Password is Not Matching!');
             }
             redirect(base_url() . 'index.php?admin/manage_profile/', 'refresh');
         }

diff --git a/application/views/backend/admin/marks.php b/application/views/backend/admin/marks.php
@@ -74,7 +74,7 @@
                         </td>
                         <td>
                             <input type="hidden" name="operation" value="selection" />
-                            <input type="submit" value="<?php echo ('Manage Marks'); ?>" class="btn btn-info" />
+                            <input type="submit" value="<?php echo ('Show Marks'); ?>" class="btn btn-info" />
                         </td>
                     </tr>
                 </table>